From b1e12b9e7f8b00b921f995d40a369c8f6cf24a7f Mon Sep 17 00:00:00 2001 From: pb Date: Sat, 17 Apr 2010 07:41:40 +0000 Subject: [PATCH] Verschiedene depreacted Klassen und Methoden entfernt. git-svn-id: https://svn.libreccm.org/ccm/trunk@369 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/doc/model/README.txt | 4 + ccm-core/doc/model/overview-sequence.usd | 409 ++++++++++++++++++ .../com/arsdigita/categorization/Category.pdl | 2 +- .../pdl/com/arsdigita/kernel/permissions.pdl | 2 +- .../pdl/com/arsdigita/messaging/Message.pdl | 2 +- .../ccm-core/default/kernel/index-users.sql | 2 +- ccm-core/sql/ccm-core/oracle-se-create.sql | 2 +- .../bebop/DefaultSingleSelectionModel.java | 3 +- ccm-core/src/com/arsdigita/bebop/Form.java | 5 +- .../src/com/arsdigita/bebop/FormData.java | 1 - .../src/com/arsdigita/bebop/FormModel.java | 4 +- ccm-core/src/com/arsdigita/bebop/Link.java | 4 +- .../com/arsdigita/bebop/ModalContainer.java | 2 +- ccm-core/src/com/arsdigita/bebop/Page.java | 104 +++-- .../bebop/ParameterSingleSelectionModel.java | 2 +- ccm-core/src/com/arsdigita/bebop/Portlet.java | 1 - .../com/arsdigita/bebop/PropertyEditor.java | 6 +- .../arsdigita/bebop/PropertyEditorModel.java | 1 - .../bebop/PropertyEditorModelBuilder.java | 1 - .../com/arsdigita/bebop/PropertySheet.java | 1 - .../arsdigita/bebop/PropertySheetModel.java | 1 - .../bebop/PropertySheetModelBuilder.java | 1 - .../com/arsdigita/bebop/SimpleComponent.java | 8 +- .../src/com/arsdigita/bebop/SplitPanel.java | 2 +- .../src/com/arsdigita/bebop/SplitWizard.java | 1 + .../arsdigita/bebop/demo/AutoDispatcher.java | 8 +- .../arsdigita/bebop/demo/BebopDispatcher.java | 4 +- .../arsdigita/bebop/demo/DemoDispatcher.java | 3 +- .../com/arsdigita/bebop/demo/HelloDate.java | 2 - .../bebop/demo/MinimalDispatcher.java | 4 - .../com/arsdigita/bebop/demo/MySitePage.java | 5 +- .../arsdigita/bebop/demo/OtherDispatcher.java | 5 +- .../com/arsdigita/bebop/demo/UserList.java | 1 - .../bebop/demo/WorkflowAdminPage.java | 1 - .../bebop/demo/workflow/AddProcess.java | 6 +- .../bebop/demo/workflow/AddTask.java | 6 +- .../bebop/demo/workflow/AdminPane.java | 6 +- .../bebop/demo/workflow/DisplayTask.java | 6 +- .../bebop/demo/workflow/Listing.java | 6 +- .../bebop/demo/workflow/Process.java | 2 - .../bebop/demo/workflow/ProcessDisplay.java | 2 - .../bebop/demo/workflow/SampleProcesses.java | 1 - .../arsdigita/bebop/demo/workflow/Task.java | 2 - .../arsdigita/bebop/event/ActionEvent.java | 8 +- .../arsdigita/bebop/event/ActionListener.java | 7 +- .../arsdigita/bebop/event/ChangeEvent.java | 2 - .../arsdigita/bebop/event/ChangeListener.java | 1 - .../bebop/event/EventListenerList.java | 5 +- .../bebop/event/FormInitListener.java | 2 - .../bebop/event/FormProcessListener.java | 2 - .../bebop/event/FormSectionEvent.java | 2 - .../bebop/event/FormSubmissionListener.java | 2 - .../bebop/event/FormValidationListener.java | 2 - .../com/arsdigita/bebop/event/PageEvent.java | 1 - .../arsdigita/bebop/event/ParameterEvent.java | 2 - .../bebop/event/ParameterListener.java | 2 - .../com/arsdigita/bebop/event/PrintEvent.java | 2 - .../arsdigita/bebop/event/PrintListener.java | 2 - .../arsdigita/bebop/event/RequestEvent.java | 2 - .../bebop/event/RequestListener.java | 1 - .../bebop/event/SearchAndSelectListener.java | 3 +- .../bebop/event/SearchAndSelectModel.java | 1 - .../bebop/event/TableActionAdapter.java | 2 - .../bebop/event/TableActionEvent.java | 2 - .../bebop/event/TableActionListener.java | 1 - .../bebop/event/TreeExpansionEvent.java | 2 - .../bebop/event/TreeExpansionListener.java | 2 - .../arsdigita/bebop/form/CheckboxGroup.java | 2 - .../com/arsdigita/bebop/form/DHTMLEditor.java | 3 - .../src/com/arsdigita/bebop/form/Date.java | 2 - .../com/arsdigita/bebop/form/FileUpload.java | 2 - .../bebop/form/FormErrorDisplay.java | 2 - .../src/com/arsdigita/bebop/form/Hidden.java | 2 - .../com/arsdigita/bebop/form/ImageSubmit.java | 2 - .../arsdigita/bebop/form/MultipleSelect.java | 2 - .../bebop/form/MultipleSelectPairWidget.java | 5 +- .../src/com/arsdigita/bebop/form/Option.java | 2 - .../com/arsdigita/bebop/form/OptionGroup.java | 2 - .../com/arsdigita/bebop/form/Password.java | 2 - .../com/arsdigita/bebop/form/RadioGroup.java | 2 - .../src/com/arsdigita/bebop/form/Reset.java | 2 - .../arsdigita/bebop/form/SearchAndSelect.java | 1 - .../src/com/arsdigita/bebop/form/Select.java | 2 - .../arsdigita/bebop/form/SingleSelect.java | 2 - .../src/com/arsdigita/bebop/form/Submit.java | 2 - .../com/arsdigita/bebop/form/TextField.java | 2 - .../src/com/arsdigita/bebop/form/Widget.java | 4 - .../bebop/jsp/DefineCheckboxGroup.java | 4 +- .../arsdigita/bebop/jsp/DefineComponent.java | 2 - .../bebop/jsp/DefineComponentExtraInfo.java | 5 +- .../bebop/jsp/DefineComponentImpl.java | 3 +- .../arsdigita/bebop/jsp/DefineContainer.java | 3 +- .../com/arsdigita/bebop/jsp/DefineForm.java | 5 +- .../bebop/jsp/DefineFormExtraInfo.java | 5 +- .../com/arsdigita/bebop/jsp/DefineImage.java | 3 +- .../com/arsdigita/bebop/jsp/DefineLink.java | 4 +- .../com/arsdigita/bebop/jsp/DefineList.java | 5 +- .../bebop/jsp/DefineListExtraInfo.java | 5 +- .../bebop/jsp/DefineMultipleSelect.java | 4 +- .../com/arsdigita/bebop/jsp/DefineOption.java | 5 +- .../bebop/jsp/DefineOptionGroup.java | 2 +- .../com/arsdigita/bebop/jsp/DefinePage.java | 4 +- .../bebop/jsp/DefinePageExtraInfo.java | 5 +- .../arsdigita/bebop/jsp/DefinePassword.java | 6 +- .../arsdigita/bebop/jsp/DefineRadioGroup.java | 4 +- .../com/arsdigita/bebop/jsp/DefineSelect.java | 3 +- .../com/arsdigita/bebop/jsp/DefineSlave.java | 2 +- .../com/arsdigita/bebop/jsp/DefineSubmit.java | 6 +- .../com/arsdigita/bebop/jsp/DefineTab.java | 4 +- .../arsdigita/bebop/jsp/DefineTabbedPane.java | 4 +- .../com/arsdigita/bebop/jsp/DefineTable.java | 5 +- .../bebop/jsp/DefineTableExtraInfo.java | 5 +- .../com/arsdigita/bebop/jsp/DefineText.java | 5 +- .../arsdigita/bebop/jsp/DefineTextArea.java | 5 +- .../bebop/jsp/DefineWidgetExtraInfo.java | 3 +- .../com/arsdigita/bebop/jsp/JSPConstants.java | 3 +- .../bebop/jsp/JspWrapperException.java | 2 - .../src/com/arsdigita/bebop/jsp/ShowAll.java | 4 +- .../com/arsdigita/bebop/jsp/ShowCellList.java | 4 +- .../arsdigita/bebop/jsp/ShowComponent.java | 4 +- .../arsdigita/bebop/jsp/ShowContainer.java | 6 +- .../src/com/arsdigita/bebop/jsp/ShowForm.java | 3 +- .../src/com/arsdigita/bebop/jsp/ShowList.java | 4 +- .../com/arsdigita/bebop/jsp/ShowListItem.java | 4 +- .../src/com/arsdigita/bebop/jsp/ShowPage.java | 4 +- .../bebop/jsp/ShowPageExtraInfo.java | 5 +- .../com/arsdigita/bebop/jsp/ShowSlave.java | 3 +- .../com/arsdigita/bebop/jsp/ShowTable.java | 6 +- .../arsdigita/bebop/jsp/ShowTableBody.java | 3 +- .../arsdigita/bebop/jsp/ShowTableHeader.java | 3 +- .../com/arsdigita/bebop/jsp/ShowTableRow.java | 3 +- .../bebop/list/DefaultListCellRenderer.java | 2 - .../bebop/list/ListCellRenderer.java | 2 - .../com/arsdigita/bebop/list/ListModel.java | 2 - .../bebop/list/ListModelBuilder.java | 2 - .../bebop/page/BebopApplicationServlet.java | 4 - .../bebop/page/BebopMapDispatcher.java | 6 +- .../arsdigita/bebop/page/PageDispatcher.java | 6 +- .../arsdigita/bebop/page/PageTransformer.java | 6 +- .../bebop/parameters/ArrayParameter.java | 1 - .../bebop/parameters/BigDecimalParameter.java | 3 +- .../bebop/parameters/BigIntegerParameter.java | 3 +- .../bebop/parameters/BitSetParameter.java | 2 - .../bebop/parameters/BooleanParameter.java | 2 - .../DateInRangeValidationListener.java | 5 +- .../bebop/parameters/DateParameter.java | 2 - .../bebop/parameters/DoubleParameter.java | 2 - .../parameters/EnumerationParameter.java | 3 +- .../EnumerationValidationListener.java | 6 +- .../FileSizeValidationListener.java | 6 +- .../bebop/parameters/FloatParameter.java | 2 - .../GlobalizedParameterListener.java | 4 +- .../bebop/parameters/IntegerParameter.java | 2 - .../parameters/KeywordValidationListener.java | 4 +- .../bebop/parameters/LongParameter.java | 2 - .../NotEmptyValidationListener.java | 6 +- .../parameters/NotNullValidationListener.java | 3 +- .../NumberInRangeValidationListener.java | 6 +- .../bebop/parameters/NumberParameter.java | 2 - .../bebop/parameters/ParameterData.java | 2 - .../bebop/parameters/ParameterModel.java | 29 +- .../StringInRangeValidationListener.java | 4 +- ...ngIsLettersOrDigitsValidationListener.java | 4 +- .../StringLengthValidationListener.java | 8 +- .../parameters/TrimmedStringParameter.java | 5 +- .../TypeCheckValidationListener.java | 5 +- .../bebop/parameters/URLParameter.java | 2 - .../URLTokenValidationListener.java | 4 +- .../com/arsdigita/bebop/portal/Portal.java | 4 - .../arsdigita/bebop/portal/PortalModel.java | 1 - .../bebop/portal/PortalModelBuilder.java | 5 +- .../com/arsdigita/bebop/portal/Portlet.java | 4 - .../bebop/portal/PortletRenderer.java | 1 - .../table/AbstractTableModelBuilder.java | 2 - .../bebop/table/DefaultTableCellRenderer.java | 2 - .../bebop/table/DefaultTableColumnModel.java | 2 - .../bebop/table/TableCellRenderer.java | 2 - .../arsdigita/bebop/table/TableColumn.java | 13 +- .../bebop/table/TableColumnModel.java | 1 - .../arsdigita/bebop/table/TableHeader.java | 1 - .../com/arsdigita/bebop/table/TableModel.java | 1 - .../bebop/table/TableModelBuilder.java | 1 - .../bebop/tree/DefaultTreeCellRenderer.java | 1 - .../bebop/tree/DefaultTreeModel.java | 1 - .../arsdigita/bebop/tree/DefaultTreeNode.java | 1 - .../bebop/tree/TreeCellRenderer.java | 1 - .../com/arsdigita/bebop/tree/TreeModel.java | 1 - .../bebop/tree/TreeModelBuilder.java | 1 - .../com/arsdigita/bebop/tree/TreeNode.java | 1 - .../com/arsdigita/bebop/util/Attributes.java | 3 +- .../arsdigita/bebop/util/BebopConstants.java | 4 - .../src/com/arsdigita/bebop/util/Color.java | 1 - ...kable.java => Lockable.java.nolongerInUse} | 1 - ...l.java => LockableImpl.java.nolongerInUse} | 1 - .../arsdigita/bebop/util/SequentialMap.java | 1 - .../src/com/arsdigita/bebop/util/Size.java | 1 - .../com/arsdigita/bebop/util/Traversal.java | 1 - .../caching/CacheEntryRemovalEvent.java | 9 +- .../categorization/CategorizationConfig.java | 5 +- .../arsdigita/categorization/Category.java | 18 +- .../ui/ACSObjectCategorySummary.java | 2 + .../com/arsdigita/db/GenericSequenceImpl.java | 3 +- .../src/com/arsdigita/db/SequenceImpl.java | 3 +- ccm-core/src/com/arsdigita/db/Sequences.java | 1 - .../developersupport/DeveloperSupport.java | 3 +- .../DeveloperSupportListener.java | 3 +- .../DeveloperSupportProfiler.java | 3 +- .../dispatcher/AbortRequestSignal.java | 1 - .../dispatcher/AccessDeniedException.java | 3 +- .../dispatcher/BaseDispatcherServlet.java | 7 +- .../dispatcher/ChainedDispatcher.java | 4 +- .../dispatcher/DirectoryListingException.java | 5 +- .../com/arsdigita/dispatcher/Dispatcher.java | 5 +- .../arsdigita/dispatcher/DispatcherChain.java | 3 +- .../dispatcher/DispatcherConstants.java | 1 - .../dispatcher/DispatcherHelper.java | 4 + .../dispatcher/InitialRequestContext.java | 6 +- .../dispatcher/InitializerServlet.java | 5 +- .../dispatcher/JSPApplicationDispatcher.java | 6 +- .../arsdigita/dispatcher/MapDispatcher.java | 6 +- .../MultipartHttpServletRequest.java | 6 +- .../dispatcher/ObjectNotFoundException.java | 4 - .../dispatcher/OrionDefaultServlet.java | 6 +- ...a => ParameterProvider.java.nolongerInUse} | 1 - .../dispatcher/RedirectException.java | 3 +- .../dispatcher/RedirectorServlet.java | 6 +- .../arsdigita/dispatcher/RequestContext.java | 4 +- .../arsdigita/dispatcher/RequestEvent.java | 3 +- .../arsdigita/dispatcher/RequestListener.java | 4 +- .../arsdigita/dispatcher/RequestValue.java | 2 - .../domain/AbstractDomainObjectObserver.java | 4 - .../domain/DataObjectNotFoundException.java | 5 +- .../arsdigita/domain/DomainCollection.java | 10 +- .../com/arsdigita/domain/DomainException.java | 4 +- .../com/arsdigita/domain/DomainObject.java | 8 +- .../domain/DomainObjectObserver.java | 6 +- .../domain/DomainObjectXMLRenderer.java | 2 +- .../src/com/arsdigita/domain/DomainQuery.java | 10 +- .../com/arsdigita/domain/DomainService.java | 9 +- .../domain/DomainServiceInterfaceExposer.java | 1 - .../com/arsdigita/domain/GlobalObserver.java | 7 +- .../domain/InstantiatorNotFoundException.java | 4 +- .../domain/ObservableDomainObject.java | 4 - .../domain/ReflectionInstantiator.java | 5 +- .../domain/xml/TraversalHandler.java | 4 +- .../formbuilder/AttributeMetaData.java | 1 - .../formbuilder/AttributeMetaDataList.java | 1 - .../arsdigita/formbuilder/AttributeType.java | 2 - .../formbuilder/FormSectionGenerator.java | 1 - .../arsdigita/formbuilder/Initializer.java | 6 +- .../formbuilder/MetaObjectCollection.java | 5 +- .../formbuilder/PersistentCheckboxGroup.java | 1 - .../formbuilder/PersistentComponent.java | 2 - .../formbuilder/PersistentContainer.java | 2 - .../arsdigita/formbuilder/PersistentDate.java | 2 - .../formbuilder/PersistentDeditor.java | 2 - .../formbuilder/PersistentEmailField.java | 10 +- .../arsdigita/formbuilder/PersistentForm.java | 2 - .../formbuilder/PersistentFormSection.java | 2 - .../formbuilder/PersistentHeading.java | 2 - .../formbuilder/PersistentLabel.java | 2 - .../formbuilder/PersistentMultipleSelect.java | 2 - .../formbuilder/PersistentOption.java | 2 - .../formbuilder/PersistentOptionGroup.java | 2 - .../formbuilder/PersistentRadioGroup.java | 2 - .../formbuilder/PersistentSelect.java | 2 - .../formbuilder/PersistentSingleSelect.java | 3 - .../formbuilder/PersistentSubmit.java | 2 - .../arsdigita/formbuilder/PersistentText.java | 2 - .../formbuilder/PersistentTextArea.java | 2 - .../formbuilder/PersistentTextField.java | 2 - .../formbuilder/PersistentWidget.java | 2 - .../formbuilder/TestAttributeListener.java | 2 - .../formbuilder/TestProcessListener.java | 2 - .../formbuilder/installer/Initializer.java | 6 +- .../PersistentParameterListener.java | 2 - ...istentStringInRangeValidationListener.java | 2 - .../ui/ClassValidationListener.java | 2 - .../formbuilder/ui/FormIDHidden.java | 2 - .../formbuilder/util/AttributeHelper.java | 7 +- ...ava => ExtendedElement.java.nolongerInUse} | 1 - .../formbuilder/util/FormBuilderConfig.java | 7 +- .../formbuilder/util/FormBuilderUtil.java | 2 - .../util/PersistentContainerHelper.java | 2 - .../globalization/AcceptCharset.java | 3 +- .../globalization/Globalization.java | 6 +- .../arsdigita/initializer/Configuration.java | 4 +- .../initializer/InitializationException.java | 4 +- .../arsdigita/initializer/Initializer.java | 13 +- .../src/com/arsdigita/initializer/Script.java | 7 +- .../com/arsdigita/initializer/Startup.java | 4 +- .../com/arsdigita/initializer/package.html | 3 +- .../arsdigita/kernel/ResourceCollection.java | 6 +- .../com/arsdigita/kernel/UserCollection.java | 4 +- .../permissions/PermissionDescriptor.java | 8 +- .../kernel/ui/DataQueryTreeModel.java | 2 - .../src/com/arsdigita/loader/MimeTypeRow.java | 2 +- .../com/arsdigita/loader/PackageLoader.java | 2 +- .../com/arsdigita/logging/ErrorReport.java | 5 +- ccm-core/src/com/arsdigita/logging/Log.java | 3 +- .../arsdigita/logging/SecureLogFilter.java | 4 +- .../logging/examples/LogExample.java | 5 +- .../logging/examples/LogExampleThread.java | 5 +- .../messaging/MessagingException.java | 2 - .../src/com/arsdigita/messaging/SortKey.java | 2 - .../arsdigita/metadata/DynamicElement.java | 4 +- .../AbstractTransactionListener.java | 4 +- ccm-core/src/com/arsdigita/persistence/C.java | 4 +- .../arsdigita/persistence/CompoundFilter.java | 5 +- .../persistence/CompoundFilterImpl.java | 4 +- .../persistence/ConnectionSource.java | 4 +- .../persistence/DataAssociation.java | 5 +- .../persistence/DataAssociationCursor.java | 4 +- .../DataAssociationCursorImpl.java | 4 +- .../persistence/DataAssociationImpl.java | 4 +- .../arsdigita/persistence/DataCollection.java | 8 +- .../persistence/DataCollectionImpl.java | 5 +- .../com/arsdigita/persistence/DataEvent.java | 4 +- .../arsdigita/persistence/DataHandler.java | 8 +- .../com/arsdigita/persistence/DataObject.java | 22 +- .../arsdigita/persistence/DataObjectImpl.java | 5 +- .../arsdigita/persistence/DataObserver.java | 5 +- .../arsdigita/persistence/DataOperation.java | 2 - .../com/arsdigita/persistence/DataQuery.java | 4 +- .../persistence/DataQueryDecorator.java | 2 - .../arsdigita/persistence/DataQueryImpl.java | 7 +- .../DedicatedConnectionSource.java | 4 +- .../arsdigita/persistence/EqualsFilter.java | 6 +- .../src/com/arsdigita/persistence/Filter.java | 4 +- .../arsdigita/persistence/FilterFactory.java | 4 +- .../persistence/FilterFactoryImpl.java | 4 +- .../com/arsdigita/persistence/FilterImpl.java | 5 +- .../arsdigita/persistence/FlushException.java | 4 +- .../persistence/GenericDataQuery.java | 4 +- .../com/arsdigita/persistence/InFilter.java | 4 +- .../src/com/arsdigita/persistence/OID.java | 24 +- .../persistence/ObjectDeletedException.java | 4 +- .../persistence/OracleSQLUtilities.java | 5 +- .../persistence/PersistenceException.java | 4 +- .../persistence/PooledConnectionSource.java | 4 +- .../persistence/PostgresSQLUtilities.java | 5 +- .../arsdigita/persistence/SQLUtilities.java | 4 +- .../arsdigita/persistence/SessionManager.java | 4 +- .../arsdigita/persistence/SimpleFilter.java | 4 +- .../persistence/TransactionContext.java | 5 +- .../persistence/UndefinedEventException.java | 3 - .../com/arsdigita/persistence/Utilities.java | 4 +- .../persistence/metadata/ObjectType.java | 3 +- .../com/arsdigita/persistence/pdl/PDL.java | 4 +- .../src/com/arsdigita/portal/Initializer.java | 2 +- ccm-core/src/com/arsdigita/portal/Portal.java | 2 +- .../src/com/arsdigita/portal/Portlet.java | 4 - .../arsdigita/portal/PortletCollection.java | 4 - .../sitenode/BasePresentationManager.java | 4 - .../sitenode/SiteNodeDispatcher.java | 6 +- .../sitenode/SiteNodeRequestContext.java | 14 +- .../toolbox/CharsetEncodingProvider.java | 3 +- .../CharsetEncodingProviderInitializer.java | 4 +- .../src/com/arsdigita/toolbox/Security.java | 4 +- .../toolbox/ui/AbstractCollectionTable.java | 1 + .../toolbox/ui/AbstractDataQueryBuilder.java | 4 +- .../com/arsdigita/toolbox/ui/ActionGroup.java | 4 - .../arsdigita/toolbox/ui/ComponentMap.java | 8 +- .../arsdigita/toolbox/ui/ComponentSet.java | 8 +- .../com/arsdigita/toolbox/ui/ContextBar.java | 4 - .../com/arsdigita/toolbox/ui/DataTable.java | 2 - .../com/arsdigita/toolbox/ui/ItemDetail.java | 1 - .../arsdigita/toolbox/ui/ItemDetailModel.java | 1 - .../toolbox/ui/ItemDetailModelBuilder.java | 1 - .../com/arsdigita/toolbox/ui/ItemEditor.java | 8 +- .../com/arsdigita/toolbox/ui/LayoutPanel.java | 4 - .../com/arsdigita/toolbox/ui/ModalPanel.java | 8 +- .../arsdigita/toolbox/ui/NullComponent.java | 4 - .../arsdigita/toolbox/ui/PropertyList.java | 4 - .../src/com/arsdigita/toolbox/ui/Section.java | 4 - .../arsdigita/toolbox/ui/SelectionPanel.java | 8 +- .../src/com/arsdigita/ui/NowDateTime.java | 4 +- .../com/arsdigita/ui/admin/ContextBar.java | 2 - .../ui/admin/ExistingGroupAddPane.java | 3 +- .../com/arsdigita/ui/admin/GroupEditForm.java | 1 - .../src/com/arsdigita/ui/admin/GroupForm.java | 1 - .../ui/admin/GroupSearchAndListModel.java | 2 - .../arsdigita/ui/admin/PartyListModel.java | 5 +- .../ui/admin/SearchAndListModel.java | 3 +- .../arsdigita/ui/admin/SubsiteDispatcher.java | 4 - .../ui/admin/URLValidationListener.java | 2 - .../arsdigita/ui/admin/UserBrowsePane.java | 5 +- .../arsdigita/ui/admin/UserSummaryPane.java | 4 +- .../src/com/arsdigita/ui/admin/Utilities.java | 2 +- ccm-core/src/com/arsdigita/util/Assert.java | 68 ++- ccm-core/src/com/arsdigita/util/Cache.java | 4 +- .../util/CheckedWrapperException.java | 1 - ccm-core/src/com/arsdigita/util/Classes.java | 5 +- ccm-core/src/com/arsdigita/util/Files.java | 4 +- .../util/HierarchyDenormalization.java | 4 +- .../arsdigita/util/JavaPropertyReader.java | 4 - .../arsdigita/util/JavaPropertyWriter.java | 4 - ccm-core/src/com/arsdigita/util/Lockable.java | 1 - .../src/com/arsdigita/util/OrderedMap.java | 5 +- ccm-core/src/com/arsdigita/util/Pair.java | 4 +- .../com/arsdigita/util/ParameterProvider.java | 5 +- ccm-core/src/com/arsdigita/util/Record.java | 4 - ccm-core/src/com/arsdigita/util/Reporter.java | 4 - .../com/arsdigita/util/ResourceManager.java | 8 +- .../src/com/arsdigita/util/SequentialMap.java | 4 +- .../src/com/arsdigita/util/ServletUtils.java | 4 +- .../src/com/arsdigita/util/StringUtils.java | 2 +- .../com/arsdigita/util/SystemProperties.java | 4 - ccm-core/src/com/arsdigita/util/Tracer.java | 4 - .../src/com/arsdigita/util/TypedText.java | 3 +- .../src/com/arsdigita/util/URLRewriter.java | 6 +- .../util/UncheckedWrapperException.java | 2 - .../src/com/arsdigita/util/WrappedError.java | 2 - .../com/arsdigita/util/servlet/Cookies.java | 4 - .../com/arsdigita/util/servlet/HttpHost.java | 4 - .../util/servlet/HttpParameterListener.java | 5 +- .../util/servlet/HttpParameterMap.java | 4 - .../util/servlet/HttpResourceLocator.java | 4 - .../com/arsdigita/versioning/Difference.java | 4 +- .../com/arsdigita/versioning/Operation.java | 4 +- .../src/com/arsdigita/versioning/Tag.java | 4 +- .../arsdigita/versioning/TagCollection.java | 4 +- .../com/arsdigita/versioning/Versioning.java | 7 +- .../versioning/VersioningConfig.java | 6 +- .../src/com/arsdigita/web/Application.java | 4 - .../arsdigita/web/ApplicationCollection.java | 4 - .../com/arsdigita/web/ApplicationSetup.java | 4 - .../com/arsdigita/web/ApplicationTool.java | 4 - .../web/ApplicationTypeCollection.java | 4 - .../arsdigita/web/BaseApplicationServlet.java | 6 +- .../src/com/arsdigita/web/BaseDispatcher.java | 4 - ccm-core/src/com/arsdigita/web/BaseJSP.java | 4 - .../src/com/arsdigita/web/CachePolicy.java | 4 - ccm-core/src/com/arsdigita/web/Debugger.java | 5 +- .../com/arsdigita/web/DispatcherServlet.java | 4 - .../web/GlobalizationParameterListener.java | 4 - .../src/com/arsdigita/web/HostLoader.java | 4 - .../arsdigita/web/InternalRequestLocal.java | 4 - .../arsdigita/web/LegacyAdapterServlet.java | 8 +- .../web/LegacyInitializerServlet.java | 6 +- .../src/com/arsdigita/web/LoginSignal.java | 4 - .../com/arsdigita/web/ParameterListener.java | 5 +- .../src/com/arsdigita/web/ParameterMap.java | 4 - .../com/arsdigita/web/PrefixerServlet.java | 4 - .../src/com/arsdigita/web/RedirectSignal.java | 4 - .../src/com/arsdigita/web/ReturnSignal.java | 4 - .../com/arsdigita/web/TransactionSignal.java | 4 - .../arsdigita/web/TransformationDebugger.java | 4 - ccm-core/src/com/arsdigita/web/URL.java | 4 - ccm-core/src/com/arsdigita/web/WebApp.java | 4 - ccm-core/src/com/arsdigita/web/WebConfig.java | 4 - .../src/com/arsdigita/web/WebContext.java | 5 +- .../com/arsdigita/web/WebContextExposer.java | 4 - .../src/com/arsdigita/web/WebExposer.java | 4 - .../web/monitoring/DBTestServlet.java | 3 +- .../arsdigita/workflow/simple/UserTask.java | 17 +- .../arsdigita/workflow/simple/Workflow.java | 5 +- .../workflow/simple/WorkflowConfig.java | 7 +- .../com/arsdigita/xmlinterp/XMLWalker.java | 4 +- .../src/com/redhat/persistence/AddEvent.java | 4 +- .../redhat/persistence/ClosedException.java | 4 +- .../src/com/redhat/persistence/Condition.java | 4 +- .../com/redhat/persistence/CreateEvent.java | 4 +- .../src/com/redhat/persistence/Cursor.java | 4 +- .../redhat/persistence/CursorException.java | 4 +- .../src/com/redhat/persistence/DataSet.java | 4 +- .../com/redhat/persistence/DeleteEvent.java | 4 +- .../src/com/redhat/persistence/Engine.java | 4 +- .../src/com/redhat/persistence/Event.java | 4 +- .../redhat/persistence/EventProcessor.java | 6 +- .../com/redhat/persistence/EventStream.java | 4 +- .../src/com/redhat/persistence/Expander.java | 3 +- .../com/redhat/persistence/Expression.java | 4 +- .../redhat/persistence/FlushException.java | 4 +- .../redhat/persistence/NoRowException.java | 4 +- .../persistence/NoSuchPathException.java | 4 +- .../persistence/NotFetchedException.java | 4 +- .../com/redhat/persistence/NullException.java | 4 +- .../com/redhat/persistence/ObjectData.java | 4 +- .../com/redhat/persistence/ObjectEvent.java | 4 +- .../src/com/redhat/persistence/Parameter.java | 4 +- .../persistence/PersistentCollection.java | 4 +- .../persistence/PersistentObjectSource.java | 4 +- .../com/redhat/persistence/PropertyData.java | 4 +- .../com/redhat/persistence/PropertyEvent.java | 4 +- .../com/redhat/persistence/PropertyMap.java | 4 +- .../com/redhat/persistence/QuerySource.java | 4 +- .../src/com/redhat/persistence/RecordSet.java | 4 +- .../com/redhat/persistence/RemoveEvent.java | 4 +- .../src/com/redhat/persistence/Session.java | 4 +- .../src/com/redhat/persistence/SetEvent.java | 4 +- .../src/com/redhat/persistence/Signature.java | 4 +- .../src/com/redhat/persistence/Source.java | 4 +- .../persistence/common/CompoundKey.java | 4 +- .../com/redhat/persistence/common/Path.java | 4 +- .../com/redhat/persistence/common/SQL.java | 4 +- .../redhat/persistence/common/SQLToken.java | 7 +- .../persistence/engine/rdbms/Aggregator.java | 4 +- .../engine/rdbms/CompoundJoin.java | 4 +- .../redhat/persistence/engine/rdbms/DML.java | 4 +- .../persistence/engine/rdbms/Delete.java | 4 +- .../persistence/engine/rdbms/Environment.java | 4 +- .../persistence/engine/rdbms/EventSwitch.java | 5 +- .../persistence/engine/rdbms/Insert.java | 4 +- .../redhat/persistence/engine/rdbms/Join.java | 4 +- .../persistence/engine/rdbms/Mutation.java | 4 +- .../redhat/persistence/engine/rdbms/Node.java | 4 +- .../persistence/engine/rdbms/Operation.java | 4 +- .../engine/rdbms/OracleWriter.java | 7 +- .../engine/rdbms/PostgresWriter.java | 8 +- .../persistence/engine/rdbms/RDBMSEngine.java | 9 +- .../engine/rdbms/RDBMSException.java | 4 +- .../engine/rdbms/RDBMSProfiler.java | 4 +- .../engine/rdbms/RDBMSRecordSet.java | 4 +- .../engine/rdbms/RDBMSStatement.java | 4 +- .../persistence/engine/rdbms/ResultCycle.java | 4 +- .../persistence/engine/rdbms/SQLWriter.java | 6 +- .../persistence/engine/rdbms/Select.java | 6 +- .../persistence/engine/rdbms/SimpleJoin.java | 4 +- .../engine/rdbms/StatementLifecycle.java | 4 +- .../persistence/engine/rdbms/StaticJoin.java | 7 +- .../engine/rdbms/StaticOperation.java | 7 +- .../rdbms/UnboundParameterException.java | 4 +- .../persistence/engine/rdbms/Update.java | 4 +- .../profiler/rdbms/CompoundProfiler.java | 4 +- .../profiler/rdbms/SQLSummary.java | 4 +- .../persistence/metadata/MetadataxSuite.java | 3 +- .../arsdigita/persistence/oql/OQLSuite.java | 4 +- .../arsdigita/persistence/oql/QueryTest.java | 4 +- .../pdl/AssociationMetadataTest.java | 4 +- .../persistence/pdl/NameFilterTest.java | 4 +- .../arsdigita/persistence/pdl/PDLSuite.java | 3 +- .../arsdigita/persistence/pdl/PDLTest.java | 4 +- .../test/src/com/arsdigita/search/Note.java | 4 +- .../src/com/arsdigita/search/SearchSuite.java | 4 +- .../search/intermedia/SearchTestChapterH.java | 2 +- .../arsdigita/search/lucene/LuceneSuite.java | 3 +- .../arsdigita/search/lucene/LuceneTest.java | 3 +- .../src/com/arsdigita/search/lucene/Note.java | 4 +- .../arsdigita/search/lucene/OtherType.java | 3 +- .../PackageDispatcherCreationCactusTest.java | 1 - .../sitenode/PersistenceCactusTest.java | 1 - .../SiteNodeDispatcherCactusTest.java | 1 - .../com/arsdigita/sitenode/SiteNodeSuite.java | 1 - .../com/arsdigita/test/ddl/DDLDiffTest.java | 4 +- .../test/ddl/DDLRegressionSuite.java | 4 +- .../junit/extensions/CoreInitializer.java | 4 +- .../junit/framework/PackageTestSuite.java | 3 +- .../com/arsdigita/ui/login/LoginSuite.java | 4 +- .../ui/login/UserRegistrationPageTest.java | 1 - .../src/com/arsdigita/util/AssertTest.java | 7 +- .../arsdigita/util/DummyRequestContext.java | 4 +- .../arsdigita/util/DummyServletContext.java | 4 +- .../util/HttpServletDummyRequest.java | 1 - .../util/HttpServletDummyResponse.java | 1 - .../com/arsdigita/util/URLRewriterTest.java | 6 +- .../src/com/arsdigita/util/UtilSuite.java | 4 +- .../com/arsdigita/util/url/URLTestSuite.java | 3 +- .../arsdigita/workflow/simple/EngineTest.java | 4 +- .../workflow/simple/PersistenceTest.java | 3 +- .../workflow/simple/TaskDefinitionTest.java | 1 - .../arsdigita/workflow/simple/TaskTest.java | 1 - .../simple/UserTaskDefinitionTest.java | 4 +- .../workflow/simple/UserTaskTest.java | 3 +- .../workflow/simple/WorkflowProcess2Test.java | 2 - .../workflow/simple/WorkflowProcessTest.java | 4 +- .../workflow/simple/WorkflowSuite.java | 2 +- .../src/com/arsdigita/xml/ACSJDOMTest.java | 6 +- .../src/com/arsdigita/xml/TagTestElement.java | 5 +- .../test/src/com/arsdigita/xml/XmlSuite.java | 3 +- .../com/redhat/persistence/ProtoSuite.java | 4 +- .../src/com/redhat/persistence/ProtoTest.java | 4 +- .../com/redhat/persistence/SessionSuite.java | 4 +- .../persistence/oql/IdentityAdapter.java | 4 +- .../com/redhat/persistence/oql/MultiSet.java | 4 +- .../redhat/persistence/oql/QuerySuite.java | 4 +- .../com/redhat/persistence/oql/QueryTest.java | 4 +- 577 files changed, 1159 insertions(+), 1632 deletions(-) create mode 100644 ccm-core/doc/model/README.txt create mode 100644 ccm-core/doc/model/overview-sequence.usd rename ccm-core/src/com/arsdigita/bebop/util/{Lockable.java => Lockable.java.nolongerInUse} (86%) rename ccm-core/src/com/arsdigita/bebop/util/{LockableImpl.java => LockableImpl.java.nolongerInUse} (85%) rename ccm-core/src/com/arsdigita/dispatcher/{ParameterProvider.java => ParameterProvider.java.nolongerInUse} (86%) rename ccm-core/src/com/arsdigita/formbuilder/util/{ExtendedElement.java => ExtendedElement.java.nolongerInUse} (87%) diff --git a/ccm-core/doc/model/README.txt b/ccm-core/doc/model/README.txt new file mode 100644 index 000000000..5f3d08f73 --- /dev/null +++ b/ccm-core/doc/model/README.txt @@ -0,0 +1,4 @@ +These models have been created using Soyatec eUML2 (Free Edition). + +For installation instructions see http://www.soyatec.com/euml2/installation/ + diff --git a/ccm-core/doc/model/overview-sequence.usd b/ccm-core/doc/model/overview-sequence.usd new file mode 100644 index 000000000..b202f0246 --- /dev/null +++ b/ccm-core/doc/model/overview-sequence.usd @@ -0,0 +1,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ccm-core/pdl/com/arsdigita/categorization/Category.pdl b/ccm-core/pdl/com/arsdigita/categorization/Category.pdl index 3e31834a9..55d36710f 100755 --- a/ccm-core/pdl/com/arsdigita/categorization/Category.pdl +++ b/ccm-core/pdl/com/arsdigita/categorization/Category.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$ +// $Id: Category.pdl 1796 2009-02-07 21:59:31Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.categorization; diff --git a/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl b/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl index dcc9b898f..f12aa972b 100755 --- a/ccm-core/pdl/com/arsdigita/kernel/permissions.pdl +++ b/ccm-core/pdl/com/arsdigita/kernel/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 1586 2007-05-31 13:05:10Z chrisgilbert23 $ +// $Id: permissions.pdl 2037 2009-12-12 15:56:26Z terry $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.kernel.permissions; diff --git a/ccm-core/pdl/com/arsdigita/messaging/Message.pdl b/ccm-core/pdl/com/arsdigita/messaging/Message.pdl index 4da9c23df..96ccff9ef 100755 --- a/ccm-core/pdl/com/arsdigita/messaging/Message.pdl +++ b/ccm-core/pdl/com/arsdigita/messaging/Message.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: Message.pdl 1501 2007-03-20 10:33:28Z chrisgilbert23 $ +// $Id: Message.pdl 1704 2008-06-08 14:45:43Z pboy $ // $DateTime: 2004/08/16 18:10:38 $ model com.arsdigita.messaging; diff --git a/ccm-core/sql/ccm-core/default/kernel/index-users.sql b/ccm-core/sql/ccm-core/default/kernel/index-users.sql index 375f9471e..77daccf55 100755 --- a/ccm-core/sql/ccm-core/default/kernel/index-users.sql +++ b/ccm-core/sql/ccm-core/default/kernel/index-users.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: index-users.sql 287 2005-02-22 00:29:02Z sskracic $ +-- $Id: index-users.sql 1980 2009-09-27 10:41:52Z pboy $ -- $DateTime: 2004/08/16 18:10:38 $ create unique index users_name_id_idx on users(name_id); diff --git a/ccm-core/sql/ccm-core/oracle-se-create.sql b/ccm-core/sql/ccm-core/oracle-se-create.sql index ca4ebf513..92adaecb7 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 1704 2008-06-08 14:45:43Z pboy $ +-- $Id: oracle-se-create.sql 2070 2010-01-28 08:47:41Z pboy $ -- $DateTime: 2004/08/16 18:10:38 $ @@ oracle-se/function-currentDate.sql diff --git a/ccm-core/src/com/arsdigita/bebop/DefaultSingleSelectionModel.java b/ccm-core/src/com/arsdigita/bebop/DefaultSingleSelectionModel.java index 1c9f3e1e4..95b567afe 100755 --- a/ccm-core/src/com/arsdigita/bebop/DefaultSingleSelectionModel.java +++ b/ccm-core/src/com/arsdigita/bebop/DefaultSingleSelectionModel.java @@ -26,7 +26,8 @@ import com.arsdigita.bebop.parameters.ParameterModel; * @version $Id: DefaultSingleSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultSingleSelectionModel - extends AbstractSingleSelectionModel { + extends AbstractSingleSelectionModel { + private RequestLocal m_key; diff --git a/ccm-core/src/com/arsdigita/bebop/Form.java b/ccm-core/src/com/arsdigita/bebop/Form.java index c1a100ee9..5de358503 100755 --- a/ccm-core/src/com/arsdigita/bebop/Form.java +++ b/ccm-core/src/com/arsdigita/bebop/Form.java @@ -91,10 +91,7 @@ import org.apache.log4j.Logger; * @version $Id: Form.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Form extends FormSection implements BebopConstants { - public static final String versionId = - "$Id: Form.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(Form.class); diff --git a/ccm-core/src/com/arsdigita/bebop/FormData.java b/ccm-core/src/com/arsdigita/bebop/FormData.java index 64325944e..d7a9a7f24 100755 --- a/ccm-core/src/com/arsdigita/bebop/FormData.java +++ b/ccm-core/src/com/arsdigita/bebop/FormData.java @@ -69,7 +69,6 @@ import com.arsdigita.util.URLRewriter; public class FormData implements Map, Cloneable { - public static final String versionId = "$Id: FormData.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private HashMap m_parameterDataValues = new HashMap(); private LinkedList m_formErrors; diff --git a/ccm-core/src/com/arsdigita/bebop/FormModel.java b/ccm-core/src/com/arsdigita/bebop/FormModel.java index a0a3a27f3..a0eb64dd4 100755 --- a/ccm-core/src/com/arsdigita/bebop/FormModel.java +++ b/ccm-core/src/com/arsdigita/bebop/FormModel.java @@ -564,9 +564,9 @@ public class FormModel implements Lockable { } /** - * Checks whether this FormModel is isLocked. + * Checks whether this FormModel is locked. * - * @return true if this FormModel is isLocked; + * @return true if this FormModel is locked; * false otherwise. * */ public final boolean isLocked() { diff --git a/ccm-core/src/com/arsdigita/bebop/Link.java b/ccm-core/src/com/arsdigita/bebop/Link.java index 8d8940e4e..2ef45c448 100755 --- a/ccm-core/src/com/arsdigita/bebop/Link.java +++ b/ccm-core/src/com/arsdigita/bebop/Link.java @@ -44,7 +44,7 @@ import org.apache.log4j.Logger; *

The target of the link above will be rendered in HTML as: * href="path/to/target/?foo=1" * If either the link text or the URL needs to be changed for a link - * within a isLocked page, a {@link PrintListener} should be used. + * within a locked page, a {@link PrintListener} should be used. * * @version $Id: Link.java 287 2005-02-22 00:29:02Z sskracic $ */ @@ -104,7 +104,7 @@ public class Link extends BaseLink { * the Link, without the need to make a separate call to * the addPrintListener method. PrintListeners * are a convenient way to alter underlying Link attributes - * such as Link text or target URL within a isLocked page + * such as Link text or target URL within a locked page * on a per request basis. */ public Link(Component child, PrintListener l) { diff --git a/ccm-core/src/com/arsdigita/bebop/ModalContainer.java b/ccm-core/src/com/arsdigita/bebop/ModalContainer.java index 8c894901a..93c30a4c8 100755 --- a/ccm-core/src/com/arsdigita/bebop/ModalContainer.java +++ b/ccm-core/src/com/arsdigita/bebop/ModalContainer.java @@ -29,7 +29,7 @@ import org.apache.log4j.Logger; * A modal container is a container that manages visibility for a set of * components. It allows only one of its children to be visible. One of its * children can be selected as the default visible component. If none is - * selected the child with index isEqual to zero is used. The modal container + * selected the child with index equal to zero is used. The modal container * sets the appropriate default and PageState-based visibility for its * children. * diff --git a/ccm-core/src/com/arsdigita/bebop/Page.java b/ccm-core/src/com/arsdigita/bebop/Page.java index fc467786b..2f19afdef 100755 --- a/ccm-core/src/com/arsdigita/bebop/Page.java +++ b/ccm-core/src/com/arsdigita/bebop/Page.java @@ -81,11 +81,14 @@ import org.apache.log4j.Logger; * @version $Id: Page.java 1270 2006-07-18 13:34:55Z cgyg9330 $ */ public class Page extends BlockStylable implements Container { + /** Class specific logger instance. */ private static final Logger s_log = Logger.getLogger(Page.class); + /** The delimiter character for components naming */ private static final String DELIMITER = "."; + /** * The prefix that gets prepended to all state variables. Components must * not use variables starting with this prefix. This guarantees that the @@ -93,7 +96,9 @@ public class Page extends BlockStylable implements Container { * interfere with each other. */ private static final String COMPONENT_PREFIX = "bbp" + DELIMITER; + private static final String INTERNAL = COMPONENT_PREFIX; + /** * The name of the special parameter that indicates which component has * been selected. @@ -103,18 +108,19 @@ public class Page extends BlockStylable implements Container { static final String CONTROL_VALUE = INTERNAL + "v"; static final Collection CONTROL_EVENT_KEYS; - static { CONTROL_EVENT_KEYS = new ArrayList(3); CONTROL_EVENT_KEYS.add(SELECTED); CONTROL_EVENT_KEYS.add(CONTROL_EVENT); CONTROL_EVENT_KEYS.add(CONTROL_VALUE); } + /** * The name of the request parameter used for the visibility state of * components stored in m_invisible. */ static final String INVISIBLE = INTERNAL + "i"; + /** * Map of stateful components (id --> Component) * SortedMap used because component based hash for page is based on concatenation of @@ -123,36 +129,48 @@ public class Page extends BlockStylable implements Container { */ private SortedMap m_componentMap; private List m_components; + /** * Map of component -> owned parameter collection */ private Map m_componentParameterMap = new HashMap(); + private FormModel m_stateModel; + /** * Container that renders this Page. */ protected Container m_panel; + private List m_actionListeners; + private List m_requestListeners; + /** * The title of the page to be added in the head of HTML output. The * title is wrapped in a Label to allow developers to add * PrintListeners to dynamically change the value of the title. */ private Label m_title; + /** * Stores the actual title for the current request. The title may be * generated with a PrintListener of the m_title Label. */ private RequestLocal m_currentTitle; + /** * A list of all the client-side stylesheets. The elements of the list * are of type Page.Stylesheet, defined at the end of this file. */ private List m_clientStylesheets; + private StringParameter m_selected; + private StringParameter m_controlEvent; + private StringParameter m_controlValue; + /** * The default (initial) visibility of components. The encoding is * identical to that for PageState.m_invisible. @@ -161,15 +179,18 @@ public class Page extends BlockStylable implements Container { * PageState. */ protected BitSet m_invisible; + /** * The PageErrorDisplay component that will display page state validation * errors on this page */ private Component m_errorDisplay; + /** * Indicates whether finish() has been called on this Page. */ private boolean m_finished = false; + /** * indicates whether pageState.stateAsURL() should export the * entire state for this page, or whether it should only export @@ -247,7 +268,6 @@ public class Page extends BlockStylable implements Container { // Initialize the RequestLocal where the title for the current // request will be kept m_currentTitle = new RequestLocal() { - protected Object initialValue(PageState state) { return m_title.firePrintEvent(state); } @@ -267,8 +287,8 @@ public class Page extends BlockStylable implements Container { // Set up the visibility tracking parameters m_invisible = new BitSet(32); - BitSetParameter p = new BitSetParameter(INVISIBLE, - BitSetParameter.ENCODE_DGAP); + BitSetParameter p = new BitSetParameter(INVISIBLE, + BitSetParameter.ENCODE_DGAP); m_stateModel.addFormParam(p); } @@ -630,10 +650,10 @@ public class Page extends BlockStylable implements Container { } if (Kernel.getConfig().isDebugEnabled() && - debugStructure(state.getRequest())) { + debugStructure(state.getRequest()) ) { Element structure = - page.newChildElement("bebop:structure", BEBOP_XML_NS); + page.newChildElement("bebop:structure", BEBOP_XML_NS); showStructure(state, structure); } @@ -664,8 +684,8 @@ public class Page extends BlockStylable implements Container { * @pre response != null */ public PageState process(HttpServletRequest request, - HttpServletResponse response) - throws ServletException { + HttpServletResponse response) + throws ServletException { PageState result = new PageState(this, request, response); try { @@ -737,8 +757,8 @@ public class Page extends BlockStylable implements Container { * @post res.isCommitted() == (return == null) */ public Document buildDocument(HttpServletRequest req, - HttpServletResponse res) - throws ServletException { + HttpServletResponse res) + throws ServletException { try { Document doc = new Document(); PageState state = process(req, res); @@ -775,7 +795,6 @@ public class Page extends BlockStylable implements Container { Assert.isUnlocked(this); Traversal componentRegistrar = new Traversal() { - protected void act(Component c) { addComponent(c); c.register(Page.this); @@ -984,14 +1003,15 @@ public class Page extends BlockStylable implements Container { public void addComponentStateParam(Component c, ParameterModel p) { Assert.isUnlocked(this); - if (!stateContains(c)) { - throw new IllegalArgumentException("Component must be registered in Page"); + if ( ! stateContains(c)) { + throw new IllegalArgumentException + ("Component must be registered in Page"); } - if (!m_stateModel.containsFormParam(p)) { + if ( ! m_stateModel.containsFormParam(p) ) { p.setName(parameterName(c, p.getName())); m_stateModel.addFormParam(p); - Collection params = (Collection) m_componentParameterMap.get(c); + Collection params = (Collection)m_componentParameterMap.get(c); if (params == null) { params = new ArrayList(); m_componentParameterMap.put(c, params); @@ -1007,6 +1027,7 @@ public class Page extends BlockStylable implements Container { return (Collection) m_componentParameterMap.get(c); } + /** * Gets the state index of a component. This is the number assigned * to the component in the register traveral @@ -1158,6 +1179,7 @@ public class Page extends BlockStylable implements Container { resetter.preorder(cmpnt); } + /** * Return the prefix that is prepended to each component's state * parameters to keep them unique. @@ -1169,10 +1191,13 @@ public class Page extends BlockStylable implements Container { // WRS: preferentially use key if it exists String key = c.getKey(); if (key == null) { - if (stateContains(c)) { + if ( stateContains(c) ) { key = String.valueOf(stateIndex(c)); } else { - throw new IllegalArgumentException("Cannot generate prefix for component: key is null " + "and component " + c.toString() + "/" + c.getKey() + " did not register with page."); + throw new IllegalArgumentException + ("Cannot generate prefix for component: key is null " + + "and component " + c.toString() + "/" + c.getKey() + + " did not register with page."); } } return COMPONENT_PREFIX + key + DELIMITER; @@ -1186,7 +1211,7 @@ public class Page extends BlockStylable implements Container { * @return the unmangled name. */ private static final String unmangle(String name) { - if (!name.startsWith(COMPONENT_PREFIX)) { + if ( ! name.startsWith(COMPONENT_PREFIX) ) { return name; } // Find the second occurence of delimiter @@ -1198,6 +1223,7 @@ public class Page extends BlockStylable implements Container { } // Procs for debugging output + private static String NAME = "name"; /** @@ -1263,7 +1289,7 @@ public class Page extends BlockStylable implements Container { parent.newChildElement("bebop:param", BEBOP_XML_NS); param.addAttribute(NAME, unmangle(p.getName())); param.addAttribute("defaultValue", - String.valueOf(req.getParameter(p.getName()))); + String.valueOf(req.getParameter(p.getName()))); param.addAttribute("currentValue", String.valueOf(s.getValue(p))); } } @@ -1288,25 +1314,25 @@ public class Page extends BlockStylable implements Container { * by implementations of hashCode & equals * @return */ - public String getComponentString() { - Iterator it = m_componentMap.keySet().iterator(); - /*int hash = 0; - while (it.hasNext()) { - String componentId = (String)it.next(); - s_log.debug("component id = " + componentId); - hash = hash | componentId.hashCode(); - s_log.debug("hash so far = " + hash); - }*/ - Date start = new Date(); - - StringBuffer hashString = new StringBuffer(); - while (it.hasNext()) { - String componentId = (String) it.next(); - hashString.append(componentId); - } - s_log.debug("Time to create hashCode for page: " + (new Date().getTime() - start.getTime())); - return hashString.toString(); - - + public String getComponentString () { + Iterator it = m_componentMap.keySet().iterator(); + /*int hash = 0; + while (it.hasNext()) { + String componentId = (String)it.next(); + s_log.debug("component id = " + componentId); + hash = hash | componentId.hashCode(); + s_log.debug("hash so far = " + hash); + }*/ + Date start = new Date(); + + StringBuffer hashString = new StringBuffer(); + while (it.hasNext()) { + String componentId = (String)it.next(); + hashString.append(componentId); + } + s_log.debug("Time to create hashCode for page: " + (new Date().getTime() - start.getTime())); + return hashString.toString(); + + } } diff --git a/ccm-core/src/com/arsdigita/bebop/ParameterSingleSelectionModel.java b/ccm-core/src/com/arsdigita/bebop/ParameterSingleSelectionModel.java index db4021c93..b9a37bc7d 100755 --- a/ccm-core/src/com/arsdigita/bebop/ParameterSingleSelectionModel.java +++ b/ccm-core/src/com/arsdigita/bebop/ParameterSingleSelectionModel.java @@ -38,11 +38,11 @@ import com.arsdigita.util.Assert; * } * * @author Stanislav Freidin + * @version $Id: ParameterSingleSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ParameterSingleSelectionModel extends AbstractSingleSelectionModel { - public static final String versionId = "$Id: ParameterSingleSelectionModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private ParameterModel m_parameter; diff --git a/ccm-core/src/com/arsdigita/bebop/Portlet.java b/ccm-core/src/com/arsdigita/bebop/Portlet.java index d1d8513fd..6af98faec 100755 --- a/ccm-core/src/com/arsdigita/bebop/Portlet.java +++ b/ccm-core/src/com/arsdigita/bebop/Portlet.java @@ -47,7 +47,6 @@ import com.arsdigita.xml.Element; * @version $Id: Portlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Portlet { - public static final String versionId = "$Id: Portlet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Builds an XML fragment and attaches it to this component's parent. * Someone implementing a TimeOfDayPortlet could, for instance, diff --git a/ccm-core/src/com/arsdigita/bebop/PropertyEditor.java b/ccm-core/src/com/arsdigita/bebop/PropertyEditor.java index d57a6052a..102d6d040 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertyEditor.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertyEditor.java @@ -138,12 +138,10 @@ import java.util.Map; *

* * @author Stanislav Freidin - * @version $Revision: #13 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: PropertyEditor.java 1638 2007-09-17 11:48:34Z chrisg23 $ */ public class PropertyEditor extends SimpleContainer { - public static final String versionId = "$Id: PropertyEditor.java 1638 2007-09-17 11:48:34Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/16 18:10:38 $"; - private SequentialMap m_forms; private SequentialMap m_labels; private Component m_display; @@ -156,7 +154,7 @@ public class PropertyEditor extends SimpleContainer { /** * Constructs a new, empty PropertyEditor. * The {@link #setDisplayComponent(Component)} method must be called before - * this component is isLocked. + * this component is locked. */ public PropertyEditor() { this(null); diff --git a/ccm-core/src/com/arsdigita/bebop/PropertyEditorModel.java b/ccm-core/src/com/arsdigita/bebop/PropertyEditorModel.java index a5e7d2b83..5c50b7bd3 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertyEditorModel.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertyEditorModel.java @@ -30,7 +30,6 @@ import com.arsdigita.bebop.Component; */ public interface PropertyEditorModel { - public static final String versionId = "$Id: PropertyEditorModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Advances to the next property, if possible. diff --git a/ccm-core/src/com/arsdigita/bebop/PropertyEditorModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/PropertyEditorModelBuilder.java index aabe8567d..bd10faa32 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertyEditorModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertyEditorModelBuilder.java @@ -31,7 +31,6 @@ import com.arsdigita.util.Lockable; */ public interface PropertyEditorModelBuilder extends Lockable { - public static final String versionId = "$Id: PropertyEditorModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constructs a {@link PropertyEditorModel} for the current request. diff --git a/ccm-core/src/com/arsdigita/bebop/PropertySheet.java b/ccm-core/src/com/arsdigita/bebop/PropertySheet.java index ccb384a88..314a8a14e 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertySheet.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertySheet.java @@ -49,7 +49,6 @@ import com.arsdigita.util.LockableImpl; */ public class PropertySheet extends Table { - public static final String versionId = "$Id: PropertySheet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private PropertySheetModelBuilder m_builder; diff --git a/ccm-core/src/com/arsdigita/bebop/PropertySheetModel.java b/ccm-core/src/com/arsdigita/bebop/PropertySheetModel.java index ed612ea00..b875534ea 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertySheetModel.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertySheetModel.java @@ -32,7 +32,6 @@ import com.arsdigita.globalization.GlobalizedMessage; public interface PropertySheetModel { - public static final String versionId = "$Id: PropertySheetModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Advances to the next property, if possible. diff --git a/ccm-core/src/com/arsdigita/bebop/PropertySheetModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/PropertySheetModelBuilder.java index 9c8012071..effaabeb4 100755 --- a/ccm-core/src/com/arsdigita/bebop/PropertySheetModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/PropertySheetModelBuilder.java @@ -32,7 +32,6 @@ import com.arsdigita.util.Lockable; public interface PropertySheetModelBuilder extends Lockable { - public static final String versionId = "$Id: PropertySheetModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Constructs a new {@link PropertySheetModel}. diff --git a/ccm-core/src/com/arsdigita/bebop/SimpleComponent.java b/ccm-core/src/com/arsdigita/bebop/SimpleComponent.java index 720f80678..ac244e2b8 100755 --- a/ccm-core/src/com/arsdigita/bebop/SimpleComponent.java +++ b/ccm-core/src/com/arsdigita/bebop/SimpleComponent.java @@ -45,15 +45,15 @@ public class SimpleComponent extends Completable /** * The Attribute object is protected to make * it easier for the Form Builder service to persist the SimpleComponent. - * Locking violation is not a problem since if the SimpleComponent is isLocked - * then the Attribute object will also be isLocked. + * Locking violation is not a problem since if the SimpleComponent is locked + * then the Attribute object will also be locked. */ protected Attributes m_attr; private String m_key = null; // name mangling key /** - * Clones a component. The clone is not isLocked and has its own set of + * Clones a component. The clone is not locked and has its own set of * attributes. * @return the clone of a component. * @post ! ((SimpleComponent) return).isLocked() @@ -108,7 +108,7 @@ public class SimpleComponent extends Completable /** * Unlocks this component. Package visibility is intentional; the * only time a component should be unlocked is when it's pooled and - * gets isLocked because it's put into a page. It needs to be unlocked + * gets locked because it's put into a page. It needs to be unlocked * when the instance is recycled. */ void unlock() { diff --git a/ccm-core/src/com/arsdigita/bebop/SplitPanel.java b/ccm-core/src/com/arsdigita/bebop/SplitPanel.java index 6dc692730..299f86f2d 100755 --- a/ccm-core/src/com/arsdigita/bebop/SplitPanel.java +++ b/ccm-core/src/com/arsdigita/bebop/SplitPanel.java @@ -34,7 +34,7 @@ import com.arsdigita.xml.Element; * * This container contains three components: "left", "right" and "header". * All three components must be present (non-null) before SplitPanel - * is isLocked. An exception will be thrown if this is not the case. + * is locked. An exception will be thrown if this is not the case. * * @author Stanislav Freidin * @version $Id: SplitPanel.java 287 2005-02-22 00:29:02Z sskracic $ diff --git a/ccm-core/src/com/arsdigita/bebop/SplitWizard.java b/ccm-core/src/com/arsdigita/bebop/SplitWizard.java index 32d80ec91..05c6ee78e 100755 --- a/ccm-core/src/com/arsdigita/bebop/SplitWizard.java +++ b/ccm-core/src/com/arsdigita/bebop/SplitWizard.java @@ -20,6 +20,7 @@ package com.arsdigita.bebop; import com.arsdigita.bebop.util.GlobalizationUtil ; import com.arsdigita.util.Assert; +import com.arsdigita.util.Assert; import com.arsdigita.xml.Element; /** diff --git a/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java index 94e62d953..60058285b 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/AutoDispatcher.java @@ -33,14 +33,10 @@ 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 $ + */ public class AutoDispatcher extends BebopMapDispatcher { - public static final String versionId = - "$Id: AutoDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(AutoDispatcher.class); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java index f331ce9cb..0a5cf685f 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/BebopDispatcher.java @@ -34,10 +34,10 @@ 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 $ + */ public class BebopDispatcher implements Dispatcher { - public static final String versionId = "$Id: BebopDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Page s_moved = buildPageMoved(); public void dispatch(HttpServletRequest req, diff --git a/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java index 325318553..7898e64d7 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/DemoDispatcher.java @@ -110,11 +110,10 @@ 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 $ */ public class DemoDispatcher extends AutoDispatcher implements BebopConstants { - public static final String versionId = "$Id: DemoDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(DemoDispatcher.class.getName()); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/HelloDate.java b/ccm-core/src/com/arsdigita/bebop/demo/HelloDate.java index 314ee5f38..4b90136d6 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/HelloDate.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/HelloDate.java @@ -30,8 +30,6 @@ import org.apache.log4j.Logger; public class HelloDate extends com.arsdigita.bebop.Label { - public static final String versionId = "$Id: HelloDate.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(HelloDate.class.getName()); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/MinimalDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/MinimalDispatcher.java index a5bfe6a57..bb44e79b8 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/MinimalDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/MinimalDispatcher.java @@ -28,10 +28,6 @@ import java.util.HashMap; */ public class MinimalDispatcher extends BebopMapDispatcher { - public static final String versionId = - "$Id: MinimalDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; /** Constructor. Instantiates the subsite url/page mapping. */ public MinimalDispatcher() { diff --git a/ccm-core/src/com/arsdigita/bebop/demo/MySitePage.java b/ccm-core/src/com/arsdigita/bebop/demo/MySitePage.java index 7b913f9ba..2246c91d1 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/MySitePage.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/MySitePage.java @@ -34,10 +34,7 @@ import org.apache.log4j.Logger; * main content area. */ public class MySitePage extends Page { - public static final String versionId = - "$Id: MySitePage.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; + private static final Logger s_log = Logger.getLogger(MySitePage.class); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/OtherDispatcher.java b/ccm-core/src/com/arsdigita/bebop/demo/OtherDispatcher.java index 88b3e9599..0f24abafb 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/OtherDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/OtherDispatcher.java @@ -41,10 +41,7 @@ import javax.servlet.http.HttpServletResponse; */ public class OtherDispatcher extends BebopMapDispatcher { - public static final String versionId = - "$Id: OtherDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; + public OtherDispatcher() { super(); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/UserList.java b/ccm-core/src/com/arsdigita/bebop/demo/UserList.java index 2216239c2..18d45f839 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/UserList.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/UserList.java @@ -38,7 +38,6 @@ import org.apache.log4j.Logger; */ public class UserList extends com.arsdigita.bebop.List { - public static final String versionId = "$Id: UserList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(UserList.class.getName()); diff --git a/ccm-core/src/com/arsdigita/bebop/demo/WorkflowAdminPage.java b/ccm-core/src/com/arsdigita/bebop/demo/WorkflowAdminPage.java index 7a28ecfaf..918bcd6e1 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/WorkflowAdminPage.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/WorkflowAdminPage.java @@ -29,7 +29,6 @@ import com.arsdigita.bebop.demo.workflow.Listing; public class WorkflowAdminPage extends Page { - public static final String versionId = "$Id: WorkflowAdminPage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public WorkflowAdminPage() { super("Workflow Mockup", makePanel()); 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 3aaa5f397..8aa8ff069 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddProcess.java @@ -38,12 +38,14 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.util.GlobalizationUtil; +/** + * + * @version $Id: AddProcess.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class AddProcess extends Form implements FormProcessListener, FormInitListener, FormSubmissionListener { - public static final String versionId = "$Id: AddProcess.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private SingleSelectionModel m_processes; private ToggleLink m_addLink; 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 103b4b72e..10bef12c5 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AddTask.java @@ -47,11 +47,13 @@ import com.arsdigita.util.Assert; import com.arsdigita.util.UncheckedWrapperException; import java.util.TooManyListenersException; +/** + * + * @version $Id: AddTask.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class AddTask extends Form implements FormProcessListener, FormSubmissionListener { - public static final String versionId = "$Id: AddTask.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final SingleSelectionModel m_processes; private OptionGroup m_deps; 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 a59031f79..1c9d337c1 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/AdminPane.java @@ -29,11 +29,13 @@ import com.arsdigita.bebop.event.ActionEvent; import com.arsdigita.bebop.event.ActionListener; import com.arsdigita.bebop.util.GlobalizationUtil; +/** + * + * @version $Id: AdminPane.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class AdminPane extends SimpleContainer implements ActionListener { - public static final String versionId = "$Id: AdminPane.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private SingleSelectionModel m_processes; private ToggleLink m_addLink; 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 bc36666e1..5c549adfa 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/DisplayTask.java @@ -47,11 +47,13 @@ import com.arsdigita.util.UncheckedWrapperException; import java.util.Iterator; import java.util.TooManyListenersException; +/** + * + * @version $Id: DisplayTask.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DisplayTask extends Form implements FormProcessListener, FormSubmissionListener { - public static final String versionId = "$Id: DisplayTask.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private SingleSelectionModel m_tasks; private SingleSelect m_selectAssignee; 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 0498306fe..6cceffbb8 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Listing.java @@ -33,11 +33,13 @@ import com.arsdigita.bebop.list.ListModelBuilder; import com.arsdigita.bebop.util.GlobalizationUtil; import java.util.NoSuchElementException; +/** + * + * @version $Id: Listing.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class Listing extends BoxPanel implements ChangeListener, ActionListener { - public static final String versionId = "$Id: Listing.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private List m_list; private ToggleLink m_addLink; 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 68dc63939..03abe9925 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Process.java @@ -37,8 +37,6 @@ import java.util.ArrayList; */ public class Process { - public static final String versionId = "$Id: Process.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_key; private String m_name; private String m_description; 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 7ab7ad75b..ac13030c6 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/ProcessDisplay.java @@ -50,8 +50,6 @@ import java.util.Iterator; public class ProcessDisplay extends BoxPanel implements ActionListener, ChangeListener, TableActionListener { - public static final String versionId = "$Id: ProcessDisplay.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final SingleSelectionModel m_processes; // The "Details for ..." label 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 43843c7d4..4dcb0f0ab 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/SampleProcesses.java @@ -37,7 +37,6 @@ import java.util.NoSuchElementException; */ public class SampleProcesses { - public static final String versionId = "$Id: SampleProcesses.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static SampleProcesses m_instance; /** 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 cc5d74987..3e1515f2c 100755 --- a/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java +++ b/ccm-core/src/com/arsdigita/bebop/demo/workflow/Task.java @@ -38,8 +38,6 @@ import java.util.Iterator; */ public class Task { - public static final String versionId = "$Id: Task.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static int s_seq = 1; private String m_key; diff --git a/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java b/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java index 75f67637e..164bc4716 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ActionEvent.java @@ -27,18 +27,16 @@ import com.arsdigita.bebop.PageState; * the click in a user's submission, for example, a form might use an * ActionEvent to signal that it has been submitted. * + * @see ActionListener + * @see java.awt.event.ActionEvent + * * @author David Lutterkort * * @version $Id: ActionEvent.java 287 2005-02-22 00:29:02Z sskracic $ - * - * @see ActionListener - * @see java.awt.event.ActionEvent */ public class ActionEvent extends PageEvent { - public static final String versionId = "$Id: ActionEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Construct an ActionEvent. * diff --git a/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java b/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java index 71f9952ca..969a29cb4 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ActionListener.java @@ -27,16 +27,15 @@ import java.util.EventListener; * the component's addActionListener method. When the action event occurs, * that object's actionPerformed method is invoked. * + * @see ActionEvent + * @see java.awt.event.ActionListener + * * @author David Lutterkort * * @version $Id: ActionListener.java 287 2005-02-22 00:29:02Z sskracic $ - * - * @see ActionEvent - * @see java.awt.event.ActionListener */ public interface ActionListener extends EventListener { - public static final String versionId = "$Id: ActionListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Invoked when an action has been performed. * diff --git a/ccm-core/src/com/arsdigita/bebop/event/ChangeEvent.java b/ccm-core/src/com/arsdigita/bebop/event/ChangeEvent.java index bbdab9655..8876f1915 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ChangeEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ChangeEvent.java @@ -26,8 +26,6 @@ import com.arsdigita.bebop.PageState; */ public class ChangeEvent extends PageEvent { - public static final String versionId = "$Id: ChangeEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public ChangeEvent(Object source, PageState state) { super(source, state); } diff --git a/ccm-core/src/com/arsdigita/bebop/event/ChangeListener.java b/ccm-core/src/com/arsdigita/bebop/event/ChangeListener.java index 4579681f4..f69dfc1dd 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ChangeListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ChangeListener.java @@ -26,6 +26,5 @@ import java.util.EventListener; */ public interface ChangeListener extends EventListener { - public static final String versionId = "$Id: ChangeListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; void stateChanged(ChangeEvent e); } diff --git a/ccm-core/src/com/arsdigita/bebop/event/EventListenerList.java b/ccm-core/src/com/arsdigita/bebop/event/EventListenerList.java index c41981c57..db42facb2 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/EventListenerList.java +++ b/ccm-core/src/com/arsdigita/bebop/event/EventListenerList.java @@ -24,11 +24,10 @@ import java.util.NoSuchElementException; /** * Convenience extensions to {@link javax.swing.event.EventListenerList * Swing's EventListenerList}. - * */ + * @version $Id: EventListenerList.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class EventListenerList extends javax.swing.event.EventListenerList { - public static final String versionId = "$Id: EventListenerList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Append all the event listeners from l. * diff --git a/ccm-core/src/com/arsdigita/bebop/event/FormInitListener.java b/ccm-core/src/com/arsdigita/bebop/event/FormInitListener.java index 41796ac6b..85a78718f 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/FormInitListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/FormInitListener.java @@ -34,8 +34,6 @@ import java.util.EventListener; public interface FormInitListener extends EventListener { - public static final String versionId = "$Id: FormInitListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Initializes a FormData object already populated with values from * the request. diff --git a/ccm-core/src/com/arsdigita/bebop/event/FormProcessListener.java b/ccm-core/src/com/arsdigita/bebop/event/FormProcessListener.java index fdd97d927..9643081fe 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/FormProcessListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/FormProcessListener.java @@ -32,8 +32,6 @@ import java.util.EventListener; public interface FormProcessListener extends EventListener { - public static final String versionId = "$Id: FormProcessListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Performs a processing step on the data in the * FormData object. diff --git a/ccm-core/src/com/arsdigita/bebop/event/FormSectionEvent.java b/ccm-core/src/com/arsdigita/bebop/event/FormSectionEvent.java index 0e879ebbc..c7e9486e4 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/FormSectionEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/FormSectionEvent.java @@ -36,8 +36,6 @@ import com.arsdigita.bebop.PageState; */ public class FormSectionEvent extends PageEvent { - public static final String versionId = "$Id: FormSectionEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private transient FormData _formData; /** diff --git a/ccm-core/src/com/arsdigita/bebop/event/FormSubmissionListener.java b/ccm-core/src/com/arsdigita/bebop/event/FormSubmissionListener.java index 84df958a6..ca791686e 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/FormSubmissionListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/FormSubmissionListener.java @@ -35,8 +35,6 @@ import com.arsdigita.bebop.FormProcessException; */ public interface FormSubmissionListener extends EventListener { - public static final String versionId = "$Id: FormSubmissionListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This method gets called as soon as the FormData for a * form has been filled with the request parameters. The values in the diff --git a/ccm-core/src/com/arsdigita/bebop/event/FormValidationListener.java b/ccm-core/src/com/arsdigita/bebop/event/FormValidationListener.java index 25ef8e6c7..6fe2cabdb 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/FormValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/FormValidationListener.java @@ -32,8 +32,6 @@ import java.util.EventListener; public interface FormValidationListener extends EventListener { - public static final String versionId = "$Id: FormValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Performs a validation check on the specified FormData * object, involving any number of parameters. diff --git a/ccm-core/src/com/arsdigita/bebop/event/PageEvent.java b/ccm-core/src/com/arsdigita/bebop/event/PageEvent.java index 8b7cd567e..93a33fb3c 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/PageEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/PageEvent.java @@ -34,7 +34,6 @@ import java.util.EventObject; */ public class PageEvent extends EventObject { - public static final String versionId = "$Id: PageEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private transient PageState _state; /** diff --git a/ccm-core/src/com/arsdigita/bebop/event/ParameterEvent.java b/ccm-core/src/com/arsdigita/bebop/event/ParameterEvent.java index a3ea29cc5..2e26b810d 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ParameterEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ParameterEvent.java @@ -37,8 +37,6 @@ import java.util.EventObject; public class ParameterEvent extends EventObject { - public static final String versionId = "$Id: ParameterEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /* The request specific data about the event */ private transient ParameterData m_data; private transient PageState m_state; diff --git a/ccm-core/src/com/arsdigita/bebop/event/ParameterListener.java b/ccm-core/src/com/arsdigita/bebop/event/ParameterListener.java index 9e6ca236c..ce91dfe93 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/ParameterListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/ParameterListener.java @@ -31,8 +31,6 @@ import java.util.EventListener; public interface ParameterListener extends EventListener { - public static final String versionId = "$Id: ParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Performs a validation check on the data objects associated with a * specific parameter. Validate should call diff --git a/ccm-core/src/com/arsdigita/bebop/event/PrintEvent.java b/ccm-core/src/com/arsdigita/bebop/event/PrintEvent.java index 7878477d0..8d90636c8 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/PrintEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/PrintEvent.java @@ -35,8 +35,6 @@ import com.arsdigita.bebop.PageState; */ public class PrintEvent extends PageEvent { - public static final String versionId = "$Id: PrintEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_target; /** diff --git a/ccm-core/src/com/arsdigita/bebop/event/PrintListener.java b/ccm-core/src/com/arsdigita/bebop/event/PrintListener.java index 892b975d5..786beb2f4 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/PrintListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/PrintListener.java @@ -62,8 +62,6 @@ import java.util.EventListener; public interface PrintListener extends EventListener { - public static final String versionId = "$Id: PrintListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Prepare the target component returned by {@link PrintEvent#getTarget * e.getTarget()} for output. The target component is an unlocked clone diff --git a/ccm-core/src/com/arsdigita/bebop/event/RequestEvent.java b/ccm-core/src/com/arsdigita/bebop/event/RequestEvent.java index c6b6714cf..9ce6ebe40 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/RequestEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/RequestEvent.java @@ -35,8 +35,6 @@ import com.arsdigita.bebop.PageState; public class RequestEvent extends PageEvent { - public static final String versionId = "$Id: RequestEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Construct an ActionEvent. * diff --git a/ccm-core/src/com/arsdigita/bebop/event/RequestListener.java b/ccm-core/src/com/arsdigita/bebop/event/RequestListener.java index bbee85e4f..50ab3ed87 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/RequestListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/RequestListener.java @@ -37,7 +37,6 @@ import java.util.EventListener; */ public interface RequestListener extends EventListener { - public static final String versionId = "$Id: RequestListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Invoked when an action has been performed. * diff --git a/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectListener.java b/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectListener.java index 220543558..807af01f2 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectListener.java @@ -21,7 +21,7 @@ package com.arsdigita.bebop.event; import java.util.EventListener; /** - * Analogous to Widget + * Analogous to Widget * PrintListeners, this is called when the widget is displayed (or * validated) to get the dataset. The dataset should be created * dynamically so it can vary according to form variables. @@ -34,6 +34,5 @@ import java.util.EventListener; * @since 4.5 */ public interface SearchAndSelectListener extends EventListener { - public static final String versionId = "$Id: SearchAndSelectListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; SearchAndSelectModel getModel( PageEvent e ); } diff --git a/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectModel.java b/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectModel.java index 73dff11cc..ef2d8a74f 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectModel.java +++ b/ccm-core/src/com/arsdigita/bebop/event/SearchAndSelectModel.java @@ -29,7 +29,6 @@ package com.arsdigita.bebop.event; * @since 4.5 */ public interface SearchAndSelectModel { - public static final String versionId = "$Id: SearchAndSelectModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Specify the user's search and restrict the result set to those queries * that match. An empty string should return all results. diff --git a/ccm-core/src/com/arsdigita/bebop/event/TableActionAdapter.java b/ccm-core/src/com/arsdigita/bebop/event/TableActionAdapter.java index 4fdbf2699..28e48f845 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/TableActionAdapter.java +++ b/ccm-core/src/com/arsdigita/bebop/event/TableActionAdapter.java @@ -30,8 +30,6 @@ package com.arsdigita.bebop.event; */ public class TableActionAdapter implements TableActionListener { - public static final String versionId = "$Id: TableActionAdapter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * A no-op implementation of {@link * TableActionListener#cellSelected(TableActionEvent)}. diff --git a/ccm-core/src/com/arsdigita/bebop/event/TableActionEvent.java b/ccm-core/src/com/arsdigita/bebop/event/TableActionEvent.java index 5aed801d5..77dfb10ff 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/TableActionEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/TableActionEvent.java @@ -33,8 +33,6 @@ import com.arsdigita.bebop.PageState; */ public class TableActionEvent extends ActionEvent { - public static final String versionId = "$Id: TableActionEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_rowKey; private Integer m_column; diff --git a/ccm-core/src/com/arsdigita/bebop/event/TableActionListener.java b/ccm-core/src/com/arsdigita/bebop/event/TableActionListener.java index ce44fa00f..d6770d0c0 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/TableActionListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/TableActionListener.java @@ -33,7 +33,6 @@ import java.util.EventListener; */ public interface TableActionListener extends EventListener { - public static final String versionId = "$Id: TableActionListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * An event handler for actions on a particular cell or a set of * cells. diff --git a/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionEvent.java b/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionEvent.java index b6c0384a1..ab38a14e3 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionEvent.java +++ b/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionEvent.java @@ -31,8 +31,6 @@ import com.arsdigita.bebop.PageState; */ public class TreeExpansionEvent extends ActionEvent { - public static final String versionId = "$Id: TreeExpansionEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_nodeKey; public TreeExpansionEvent(Component source, PageState s, Object nodeKey) { diff --git a/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionListener.java b/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionListener.java index 92d218c55..39e295304 100755 --- a/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionListener.java +++ b/ccm-core/src/com/arsdigita/bebop/event/TreeExpansionListener.java @@ -29,8 +29,6 @@ import java.util.EventListener; */ public interface TreeExpansionListener extends EventListener { - public static final String versionId = "$Id: TreeExpansionListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Called whenever an item in the tree has been collapsed. */ diff --git a/ccm-core/src/com/arsdigita/bebop/form/CheckboxGroup.java b/ccm-core/src/com/arsdigita/bebop/form/CheckboxGroup.java index 94d10cf1f..212517b2c 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/CheckboxGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/form/CheckboxGroup.java @@ -37,8 +37,6 @@ import com.arsdigita.bebop.util.BebopConstants; * @version $Id: CheckboxGroup.java 738 2005-09-01 12:36:52Z sskracic $ */ public class CheckboxGroup extends OptionGroup implements BebopConstants { - public static final String versionId = "$Id: CheckboxGroup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public CheckboxGroup(String name) { this(new ArrayParameter(name)); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java index 4cfb4a215..f0d4249d2 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java +++ b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java @@ -47,9 +47,6 @@ import com.arsdigita.xml.Element; */ public class DHTMLEditor extends TextArea { - public static final String versionId = - "$Id: DHTMLEditor.java 1543 2007-03-27 09:11:02Z chrisgilbert23 $"; - /** * Constant for specifying OFF value for the WRAP attribute * of this image input. diff --git a/ccm-core/src/com/arsdigita/bebop/form/Date.java b/ccm-core/src/com/arsdigita/bebop/form/Date.java index 4e5c6adc2..5e53d7b93 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Date.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Date.java @@ -52,8 +52,6 @@ import java.util.Locale; */ public class Date extends Widget implements BebopConstants { - public static final String versionId = "$Id: Date.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - protected OptionGroup m_year; protected OptionGroup m_month; protected TextField m_day; diff --git a/ccm-core/src/com/arsdigita/bebop/form/FileUpload.java b/ccm-core/src/com/arsdigita/bebop/form/FileUpload.java index a44d415a3..f24589bbd 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/FileUpload.java +++ b/ccm-core/src/com/arsdigita/bebop/form/FileUpload.java @@ -40,8 +40,6 @@ import javax.servlet.http.HttpServletRequest; public class FileUpload extends Widget { - public static final String versionId = "$Id: FileUpload.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public FileUpload(String name) { this(name, true); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/FormErrorDisplay.java b/ccm-core/src/com/arsdigita/bebop/form/FormErrorDisplay.java index e36a5a180..3d9d4e4e4 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/FormErrorDisplay.java +++ b/ccm-core/src/com/arsdigita/bebop/form/FormErrorDisplay.java @@ -41,8 +41,6 @@ import java.util.Collections; */ public class FormErrorDisplay extends PageErrorDisplay { - public static final String versionId = "$Id: FormErrorDisplay.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Form m_form; /** diff --git a/ccm-core/src/com/arsdigita/bebop/form/Hidden.java b/ccm-core/src/com/arsdigita/bebop/form/Hidden.java index ab7cabab8..1d39c0967 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Hidden.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Hidden.java @@ -32,8 +32,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; */ public class Hidden extends Widget { - public static final String versionId = "$Id: Hidden.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Hidden(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/ImageSubmit.java b/ccm-core/src/com/arsdigita/bebop/form/ImageSubmit.java index 7f74f2c5c..16e130ccd 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/ImageSubmit.java +++ b/ccm-core/src/com/arsdigita/bebop/form/ImageSubmit.java @@ -31,8 +31,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; */ public class ImageSubmit extends Widget { - public static final String versionId = "$Id: ImageSubmit.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Constant for specifying LEFT alignment of this image input. * See here diff --git a/ccm-core/src/com/arsdigita/bebop/form/MultipleSelect.java b/ccm-core/src/com/arsdigita/bebop/form/MultipleSelect.java index 7183cbfd9..12833b53e 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/MultipleSelect.java +++ b/ccm-core/src/com/arsdigita/bebop/form/MultipleSelect.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.util.BebopConstants; * @version $Id: MultipleSelect.java 287 2005-02-22 00:29:02Z sskracic $ */ public class MultipleSelect extends Select implements BebopConstants { - public static final String versionId = "$Id: MultipleSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public MultipleSelect(String name) { super(new ArrayParameter(name)); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/MultipleSelectPairWidget.java b/ccm-core/src/com/arsdigita/bebop/form/MultipleSelectPairWidget.java index 566424048..a5473a6b0 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/MultipleSelectPairWidget.java +++ b/ccm-core/src/com/arsdigita/bebop/form/MultipleSelectPairWidget.java @@ -65,11 +65,10 @@ import org.apache.log4j.Logger; * * @see Option * @see OptionGroup - * @version $Revision: #11 $ $Date: 2004/08/16 $ */ + * @version $Id: MultipleSelectPairWidget.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class MultipleSelectPairWidget extends FormStep { - public static final String versionId = "$Id: MultipleSelectPairWidget.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(MultipleSelectPairWidget.class); diff --git a/ccm-core/src/com/arsdigita/bebop/form/Option.java b/ccm-core/src/com/arsdigita/bebop/form/Option.java index 31f2da3c0..b8db1dfbd 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Option.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Option.java @@ -38,8 +38,6 @@ import com.arsdigita.xml.Element; */ public class Option extends BlockStylable { - public static final String versionId = "$Id: Option.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_value; private OptionGroup m_group; private Component m_component; diff --git a/ccm-core/src/com/arsdigita/bebop/form/OptionGroup.java b/ccm-core/src/com/arsdigita/bebop/form/OptionGroup.java index c559d7463..e97132d2a 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/OptionGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/form/OptionGroup.java @@ -48,8 +48,6 @@ import org.apache.log4j.Logger; public abstract class OptionGroup extends Widget implements BebopConstants { - public static final String versionId = "$Id: OptionGroup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger( OptionGroup.class ); /** diff --git a/ccm-core/src/com/arsdigita/bebop/form/Password.java b/ccm-core/src/com/arsdigita/bebop/form/Password.java index 67e2abff2..2943d2b54 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Password.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Password.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; */ public class Password extends Widget { - public static final String versionId = "$Id: Password.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Password(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/RadioGroup.java b/ccm-core/src/com/arsdigita/bebop/form/RadioGroup.java index 9de5f77ef..e852e3bfb 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/RadioGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/form/RadioGroup.java @@ -37,8 +37,6 @@ import com.arsdigita.bebop.util.BebopConstants; * @version $Id: RadioGroup.java 738 2005-09-01 12:36:52Z sskracic $ */ public class RadioGroup extends OptionGroup implements BebopConstants { - public static final String versionId = "$Id: RadioGroup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // xml attribute for layout private final static String AXIS = "axis"; diff --git a/ccm-core/src/com/arsdigita/bebop/form/Reset.java b/ccm-core/src/com/arsdigita/bebop/form/Reset.java index 7a0e54741..feea8b7a0 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Reset.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Reset.java @@ -36,8 +36,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; */ public class Reset extends Widget { - public static final String versionId = "$Id: Reset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Reset(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/SearchAndSelect.java b/ccm-core/src/com/arsdigita/bebop/form/SearchAndSelect.java index 860eda796..e71dd3aae 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/SearchAndSelect.java +++ b/ccm-core/src/com/arsdigita/bebop/form/SearchAndSelect.java @@ -58,7 +58,6 @@ import org.apache.log4j.Logger; public class SearchAndSelect extends FormSection implements BebopConstants, PrintListener { - public static final String versionId = "$Id: SearchAndSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_cat = Logger.getLogger(SearchAndSelect.class); diff --git a/ccm-core/src/com/arsdigita/bebop/form/Select.java b/ccm-core/src/com/arsdigita/bebop/form/Select.java index 30665b785..8459affd7 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Select.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Select.java @@ -36,8 +36,6 @@ import com.arsdigita.bebop.util.BebopConstants; * @version $Id: Select.java 738 2005-09-01 12:36:52Z sskracic $ */ public abstract class Select extends OptionGroup implements BebopConstants { - public static final String versionId = "$Id: Select.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Select(ParameterModel model) { super(model); m_xmlElement = BEBOP_OPTION; diff --git a/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java b/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java index 42a658dc2..070a80ff6 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java +++ b/ccm-core/src/com/arsdigita/bebop/form/SingleSelect.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; * @version $Id: SingleSelect.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SingleSelect extends Select { - public static final String versionId = "$Id: SingleSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** The XML tag. * @return The tag to be used for the top level DOM element * generated for this type of Widget. diff --git a/ccm-core/src/com/arsdigita/bebop/form/Submit.java b/ccm-core/src/com/arsdigita/bebop/form/Submit.java index b49d7ec34..72d5bb2fd 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Submit.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Submit.java @@ -43,8 +43,6 @@ import com.arsdigita.xml.Element; */ public class Submit extends Widget { - public static final String versionId = "$Id: Submit.java 998 2005-11-15 22:27:13Z sskracic $ by $Author: sskracic $, $DateTime: $"; - private GlobalizedMessage m_buttonLabel; /** diff --git a/ccm-core/src/com/arsdigita/bebop/form/TextField.java b/ccm-core/src/com/arsdigita/bebop/form/TextField.java index b3de1e1cd..ee510e616 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/TextField.java +++ b/ccm-core/src/com/arsdigita/bebop/form/TextField.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.parameters.ParameterModel; */ public class TextField extends Widget { - public static final String versionId = "$Id: TextField.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public TextField(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/form/Widget.java b/ccm-core/src/com/arsdigita/bebop/form/Widget.java index acc9e4478..cf2d09ded 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Widget.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Widget.java @@ -71,10 +71,6 @@ import com.arsdigita.xml.Element; * @version $Id: Widget.java 1537 2007-03-23 15:33:34Z chrisgilbert23 $ */ public abstract class Widget extends BlockStylable implements Cloneable, BebopConstants { - public static final String versionId = - "$Id: Widget.java 1537 2007-03-23 15:33:34Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Widget.class); diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java index 5211f9067..c86e07c44 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineCheckboxGroup.java @@ -29,13 +29,13 @@ import com.arsdigita.bebop.form.OptionGroup; * <define:option name="label" value="value"/> * </define:checkboxGroup> * + * + * @version $Id: DefineCheckboxGroup.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineCheckboxGroup extends DefineOptionGroup { private boolean m_vertical; - public static final String versionId = "$Id: DefineCheckboxGroup.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - OptionGroup createOptionGroup() { OptionGroup og = new CheckboxGroup(getName()); if (m_vertical) { diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponent.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponent.java index b21563709..2ca1ef90e 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponent.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponent.java @@ -36,8 +36,6 @@ public abstract class DefineComponent extends BodyTagSupport { private final static String CONTAINER_ERROR = "define:component must be contained within a container definition."; - public static final String versionId = "$Id: DefineComponent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public int doStartTag() throws JspException { if (getName() != null) { pageContext.setAttribute(getName(), getComponent()); diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentExtraInfo.java index aa4d6ffc3..62a4a5450 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: DefineComponentExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineComponentExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefineComponentExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentImpl.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentImpl.java index 8bd74f862..17a86f3d4 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentImpl.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineComponentImpl.java @@ -32,10 +32,11 @@ import javax.servlet.jsp.JspException; * 

<define:component classname="component.class.name"> ...
  * ...
  * </define:component>
+ * + * @version $Id: DefineComponentImpl.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineComponentImpl extends DefineContainer { - public static final String versionId = "$Id: DefineComponentImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private String m_className; private Component m_component; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineContainer.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineContainer.java index c575f57ea..aca652298 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineContainer.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineContainer.java @@ -25,9 +25,10 @@ import org.apache.log4j.Logger; /** * Tag for defining a Bebop container in a JSP. + * + * @version $Id: DefineContainer.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class DefineContainer extends DefineComponent { - public static final String versionId = "$Id: DefineContainer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(DefineComponent.class.getName()); diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineForm.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineForm.java index 7ff4728fd..89c7cc082 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineForm.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineForm.java @@ -22,9 +22,12 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Form; import javax.servlet.jsp.JspException; +/** + * + * @version Id: DefineForm.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineForm extends DefineContainer { - public static final String versionId = "$Id: DefineForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Form m_form; private String m_encType; private String m_onSubmit; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineFormExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineFormExtraInfo.java index 78d33ea3c..bf50cd41b 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineFormExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineFormExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: DefineFormExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineFormExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefineFormExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineImage.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineImage.java index ae1edade9..1dace8e47 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineImage.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineImage.java @@ -24,9 +24,10 @@ import javax.servlet.jsp.JspException; /** * Tag handler for definining an Image. + * + * @version $Id: DefineImage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineImage extends DefineComponent { - public static final String versionId = "$Id: DefineImage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Image m_image; private String m_src; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineLink.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineLink.java index 1952dd54f..f3e34adc1 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineLink.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineLink.java @@ -24,6 +24,8 @@ import javax.servlet.jsp.JspException; /** * Tag handler for definining a Link. + * + * @version $Id: DefineLink.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineLink extends DefineComponent { @@ -31,8 +33,6 @@ public class DefineLink extends DefineComponent { private String m_url; private String m_label; - public static final String versionId = "$Id: DefineLink.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // must override this method because we're not adding the // link to the page until the *end* of the tag. (Otherwise we // don't know the contents.) diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineList.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineList.java index 3252787f0..6e9a02e6c 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineList.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineList.java @@ -22,9 +22,12 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.List; import javax.servlet.jsp.JspException; +/** + * + * @version $Id: DefineList.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineList extends DefineComponent { - public static final String versionId = "$Id: DefineList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private List m_list; public int doStartTag() throws JspException { diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineListExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineListExtraInfo.java index 7fa6d684b..55d5fd94b 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineListExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineListExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: DefineListExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineListExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefineListExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineMultipleSelect.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineMultipleSelect.java index b278a8a3d..097937c76 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineMultipleSelect.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineMultipleSelect.java @@ -29,11 +29,11 @@ import com.arsdigita.bebop.form.OptionGroup; * <define:option name="label" value="value"/> * </define:multipleSelect> * + * + * @version $Id: DefineMultipleSelect.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineMultipleSelect extends DefineOptionGroup { - public static final String versionId = "$Id: DefineMultipleSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - OptionGroup createOptionGroup() { return new MultipleSelect(getName()); } diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineOption.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineOption.java index 2dd4a1181..efab4fbd1 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineOption.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineOption.java @@ -39,12 +39,11 @@ import javax.servlet.jsp.tagext.Tag; * <define:option name="msg.key" bundle="com.arsdigita.MyBundleName" value="value"/> * + * + * @version $Id: DefineOption.java 287 2005-02-22 00:29:02Z sskracic $ */ - public class DefineOption extends DefineComponent { - public static final String versionId = "$Id: DefineOption.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Option m_option; private String m_value; private boolean m_selected; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineOptionGroup.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineOptionGroup.java index 414257751..b85b9dc6d 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineOptionGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineOptionGroup.java @@ -31,9 +31,9 @@ import javax.servlet.jsp.JspException; * we need. * * @author Bill Schneider + * @version $Id: DefineOptionGroup.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class DefineOptionGroup extends DefineContainer { - public static final String versionId = "$Id: DefineOptionGroup.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private OptionGroup m_optionGroup; private String m_onSelect; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePage.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePage.java index 7c31afd2f..cb561f753 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePage.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePage.java @@ -62,11 +62,11 @@ import org.apache.log4j.Logger; *

Note on Bebop static/dynamic split: You should not assume * that any code inside define:page will be executed more than once. * The created Page object may be cached. + * + * @version $Id: DefinePage.java 1498 2007-03-19 16:22:15Z apevec $ */ public class DefinePage extends DefineContainer implements JSPConstants { - public static final String versionId = "$Id: DefinePage.java 1498 2007-03-19 16:22:15Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; - private Page m_page; private String m_title; private String m_application; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePageExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePageExtraInfo.java index 0ede3a133..4cb4051fd 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePageExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePageExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: DefinePageExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefinePageExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefinePageExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePassword.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePassword.java index a2311f4dd..ee8aff1eb 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefinePassword.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefinePassword.java @@ -22,10 +22,12 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.form.Password; import javax.servlet.jsp.JspException; +/** + * + * @version $Id: DefinePassword.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefinePassword extends DefineComponent { - public static final String versionId = "$Id: DefinePassword.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Password m_password; private int m_maxLength; private int m_size; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineRadioGroup.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineRadioGroup.java index 93c851f2a..126bc3f4d 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineRadioGroup.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineRadioGroup.java @@ -29,11 +29,11 @@ import com.arsdigita.bebop.form.RadioGroup; * <define:option name="label" value="value"/> * </define:radioGroup> * + * + * @version $Id: DefineRadioGroup.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineRadioGroup extends DefineOptionGroup { - public static final String versionId = "$Id: DefineRadioGroup.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - OptionGroup createOptionGroup() { return new RadioGroup(getName()); } diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSelect.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSelect.java index 68aa25dc1..3c37166ca 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSelect.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSelect.java @@ -29,11 +29,10 @@ import com.arsdigita.bebop.form.SingleSelect; * <define:option name="label" value="value"/> * </define:select> * + * @version $Id: DefineSelect.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineSelect extends DefineOptionGroup { - public static final String versionId = "$Id: DefineSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - OptionGroup createOptionGroup() { return new SingleSelect(getName()); } diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSlave.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSlave.java index 47292ac02..77f4e5632 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSlave.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSlave.java @@ -26,9 +26,9 @@ import javax.servlet.jsp.JspException; * Tag to indicate where the generated XML from a slave page * should be nested within the XML generated from the master page * that contains it. + * @version $Id: DefineSlave.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineSlave extends DefineComponent { - public static final String versionId = "$Id: DefineSlave.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private SlaveComponent m_slave; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSubmit.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSubmit.java index f7ff8196f..76a4517b8 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineSubmit.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineSubmit.java @@ -43,11 +43,11 @@ import javax.servlet.jsp.JspException; * <define:submit name="mySubmit" label="Submit form now!"/> * * - * @see com.arsdigita.bebop.form.Submit */ + * @see com.arsdigita.bebop.form.Submit + * @version $Id: DefineSubmit.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineSubmit extends DefineComponent { - public static final String versionId = "$Id: DefineSubmit.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Submit m_submit; private String m_label; private String m_bundleName; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTab.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTab.java index 73d21e0c2..dcbcde0bc 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTab.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTab.java @@ -30,11 +30,11 @@ import javax.servlet.jsp.JspException; * the tag. The define:tab tag is a special case because we have to * call addTab(String label, Component) to add tabs to the * tabbed pane, not justadd(Component). + * + * @version $Id: DefineTab.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineTab extends DefineContainer { - public static final String versionId = "$Id: DefineTab.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Component m_child; private String m_label; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTabbedPane.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTabbedPane.java index 434f1533b..9af74acd8 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTabbedPane.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTabbedPane.java @@ -25,11 +25,11 @@ import javax.servlet.jsp.JspException; /** * Class for defining a tabbed pane inside a Bebop page, defined * via JSP tags. + * + * @version $Id: DefineTabbedPane.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineTabbedPane extends DefineContainer { - public static final String versionId = "$Id: DefineTabbedPane.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private TabbedPane m_tabbedPane; public int doStartTag() throws JspException { diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTable.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTable.java index 10b78eafe..a829a7ccf 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTable.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTable.java @@ -22,9 +22,12 @@ import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Table; import javax.servlet.jsp.JspException; +/** + * + * @version $Id: DefineTable.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineTable extends DefineComponent { - public static final String versionId = "$Id: DefineTable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Table m_table; public int doStartTag() throws JspException { diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTableExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTableExtraInfo.java index bdfd72686..6abb130b1 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTableExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTableExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: DefineTableExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineTableExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefineTableExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineText.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineText.java index bb8b13f3b..8f17c6cf4 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineText.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineText.java @@ -25,6 +25,10 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import javax.servlet.jsp.JspException; +/** + * + * @version $Id: DefineText.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineText extends DefineComponent { private TextField m_text; @@ -38,7 +42,6 @@ public class DefineText extends DefineComponent { private final static String s_errorMsg = "type must be an instance of ParameterModel"; - public static final String versionId = "$Id: DefineText.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public int doStartTag() throws JspException { ParameterModel pm = null; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTextArea.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTextArea.java index 94dbf9ed2..57a38c1e6 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineTextArea.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineTextArea.java @@ -25,6 +25,10 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import javax.servlet.jsp.JspException; +/** + * + * @version $Id: DefineTextArea.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DefineTextArea extends DefineComponent { private TextArea m_textArea; @@ -42,7 +46,6 @@ public class DefineTextArea extends DefineComponent { private final static String s_wrapErrorMessage = "wrap must be soft, hard, or off"; - public static final String versionId = "$Id: DefineTextArea.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public int doStartTag() throws JspException { ParameterModel pm = null; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/DefineWidgetExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/DefineWidgetExtraInfo.java index 81681e6d3..c05dbd416 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/DefineWidgetExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/DefineWidgetExtraInfo.java @@ -31,10 +31,11 @@ import javax.servlet.jsp.tagext.VariableInfo; * <define:text name="inputFieldName"/> & <% inputFieldName.addParameterListener(new NotEmptyValidationListener()); %> * + * + * @version $Id: DefineWidgetExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefineWidgetExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: DefineWidgetExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo(data.getAttributeString("name"), diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/JSPConstants.java b/ccm-core/src/com/arsdigita/bebop/jsp/JSPConstants.java index a03bc3d6e..2623ba3a5 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/JSPConstants.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/JSPConstants.java @@ -20,9 +20,10 @@ package com.arsdigita.bebop.jsp; /** * Interface class for JSP constants. + * + * @version $Id: JSPConstants.java 287 2005-02-22 00:29:02Z sskracic $ */ interface JSPConstants { - public static final String versionId = "$Id: JSPConstants.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; final static String BEBOP_XMLNS = "http://www.arsdigita.com/bebop/1.0"; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/JspWrapperException.java b/ccm-core/src/com/arsdigita/bebop/jsp/JspWrapperException.java index f51ae6013..559fe1a93 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/JspWrapperException.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/JspWrapperException.java @@ -32,8 +32,6 @@ import com.arsdigita.util.Assert; */ public class JspWrapperException extends RuntimeException { - public static final String versionId = "$Id: JspWrapperException.java 287 2005-02-22 00:29:02Z sskracic $"; - Throwable m_rootCause; /** diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowAll.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowAll.java index c0b05ceae..94395c817 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowAll.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowAll.java @@ -35,14 +35,14 @@ import org.apache.log4j.Logger; * having to put a <show:component> tag for every * <define:component> tag, you simply need a single * <show:all> tag. + * + * @version $Id: ShowAll.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowAll extends ShowContainer { public static final Logger s_log = Logger.getLogger(ShowAll.class); - public static final String versionId = "$Id: ShowAll.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private com.arsdigita.xml.Document m_resultDoc; private com.arsdigita.xml.Document m_inputDoc; private Document m_resultDom; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowCellList.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowCellList.java index a2b99e664..c83f0856d 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowCellList.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowCellList.java @@ -31,12 +31,12 @@ import org.w3c.dom.traversal.TreeWalker; * * @see com.arsdigita.bebop.jsp.ShowTable * @see com.arsdigita.bebop.jsp.ShowList + * + * @version $Id: ShowCellList.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class ShowCellList extends ShowContainer { - public static final String versionId = "$Id: ShowCellList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private TreeWalker m_walker; private Node m_currentCell; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowComponent.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowComponent.java index b597ca24e..3c5c01d82 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowComponent.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowComponent.java @@ -39,11 +39,11 @@ import org.w3c.dom.traversal.TreeWalker; * This will have the effect of finding an element in the XML * document whose name attribute is "bebopComponent" and copying * the subtree rooted at this element into the result document. + * + * @version $Id: ShowComponent.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowComponent extends BodyTagSupport implements JSPConstants { - public static final String versionId = "$Id: ShowComponent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_name; /** diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowContainer.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowContainer.java index ca28d96ea..2f78e89d9 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowContainer.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowContainer.java @@ -23,10 +23,12 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.Text; +/** + * + * $Id: ShowContainer.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ShowContainer extends ShowComponent { - public static final String versionId = "$Id: ShowContainer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Node m_inputContext; private Node m_outputContext; private boolean m_empty = true; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowForm.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowForm.java index 046341e31..ccf2ab554 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowForm.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowForm.java @@ -29,10 +29,11 @@ import org.w3c.dom.traversal.TreeWalker; * A Bebop form is a special case of a container because we need to * preserve the pageState children which will later turn into * <input type=hidden>. + * + * @version $Id: ShowForm.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowForm extends ShowContainer { - public static final String versionId = "$Id: ShowForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Node m_oldOutputContext; private Node m_formResult; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowList.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowList.java index 63be641e2..e0204ffa1 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowList.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowList.java @@ -44,11 +44,11 @@ import org.w3c.dom.traversal.TreeWalker; * Note that a Bebop List isn't really a Container, but from the JSP's * perspective of manipulating Bebop XML output, and not the components * themselves, the behavior is container-like. + * + * @version $Id: ShowList.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowList extends ShowCellList { - public static final String versionId = "$Id: ShowList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * set up the input context as our parent class would except * evaluate the body of the show:list tag only if the list in diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowListItem.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowListItem.java index 9078b7545..c7e26ccb7 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowListItem.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowListItem.java @@ -41,11 +41,11 @@ import org.w3c.dom.Node; * * This has the effect of locally-styling the list contents in the JSP, * while globally styling the individual item inside the list. + * + * @version $Id: ShowListItem.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowListItem extends ShowComponent { - public static final String versionId = "$Id: ShowListItem.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public int doEndTag() { // we don't have a named component, but we find our parent // show:list tag copy the contents of the current cell over diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowPage.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowPage.java index 5d9e7dc8a..bd7a56b13 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowPage.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowPage.java @@ -57,12 +57,12 @@ import org.w3c.dom.Node; * <bebop:page> * ... contents from nested JSP content + tags ... * </bebop:page> + * + * @version $Id: ShowPage.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowPage extends ShowContainer { - public static final String versionId = "$Id: ShowPage.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private com.arsdigita.xml.Document m_resultDoc; private com.arsdigita.xml.Document m_inputDoc; private Document m_resultDom; diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowPageExtraInfo.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowPageExtraInfo.java index d37bfd264..24d357063 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowPageExtraInfo.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowPageExtraInfo.java @@ -22,9 +22,12 @@ import javax.servlet.jsp.tagext.TagData; import javax.servlet.jsp.tagext.TagExtraInfo; import javax.servlet.jsp.tagext.VariableInfo; +/** + * + * @version $Id: ShowPageExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ShowPageExtraInfo extends TagExtraInfo { - public static final String versionId = "$Id: ShowPageExtraInfo.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { new VariableInfo("pageState", diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowSlave.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowSlave.java index 6ffa558d1..cf6d80263 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowSlave.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowSlave.java @@ -27,10 +27,11 @@ import org.w3c.dom.NodeList; /** * tag for including the contents of a slave page within the * result page's current output context. + * + * @version $Id: ShowSlave.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowSlave extends ShowComponent { - public static final String versionId = "$Id: ShowSlave.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public int doEndTag() throws JspException { com.arsdigita.xml.Document wrapper = (com.arsdigita.xml.Document)pageContext.getRequest() diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTable.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTable.java index b34894ba9..a644da4c5 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTable.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTable.java @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ -package com.arsdigita.bebop.jsp; +package com.arsdigita.bebop.jsp; /** @@ -52,11 +52,11 @@ package com.arsdigita.bebop.jsp; * Note that a Bebop Table isn't really a Container, but from the JSP's * perspective of manipulating Bebop XML output, and not the components * themselves, the behavior is container-like. + * + * @version $Id: ShowTable.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowTable extends ShowContainer { - public static final String versionId = "$Id: ShowTable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // maybe this is just a synonym for ShowContainer? // ShowContainer sets up our input context... } diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableBody.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableBody.java index 4f3f0bf87..4b783e488 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableBody.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableBody.java @@ -26,12 +26,11 @@ import org.w3c.dom.traversal.TreeWalker; /** * JSP tag handler to iterate over rows in a model-backed Table body. * @see com.arsdigita.bebop.jsp.ShowTable + * @version $Id: ShowTableBody.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowTableBody extends ShowCellList { - public static final String versionId = "$Id: ShowTableBody.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns a TreeWalker to pick out rows in the bebop:tbody * section of this table. diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableHeader.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableHeader.java index 604ec83cd..36adf270e 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableHeader.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableHeader.java @@ -26,12 +26,11 @@ import org.w3c.dom.traversal.TreeWalker; /** * JSP tag handler to show contents from a model-backed Table header. * @see com.arsdigita.bebop.jsp.ShowTable + * @version $Id: ShowTableHeader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowTableHeader extends ShowCellList { - public static final String versionId = "$Id: ShowTableHeader.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns a TreeWalker to pick out cells in the bebop:thead * section of this table. diff --git a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableRow.java b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableRow.java index 0adfa15ec..d2717f5b8 100755 --- a/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableRow.java +++ b/ccm-core/src/com/arsdigita/bebop/jsp/ShowTableRow.java @@ -27,12 +27,11 @@ import org.w3c.dom.traversal.TreeWalker; * JSP tag handler to show columns from a model-backed Table row. * @see com.arsdigita.bebop.jsp.ShowTable * @see com.arsdigita.bebop.jsp.ShowTableBody + * @version $Id: ShowTableRow.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ShowTableRow extends ShowCellList { - public static final String versionId = "$Id: ShowTableRow.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns a TreeWalker to pick out cells in the bebop:thead * section of this table. diff --git a/ccm-core/src/com/arsdigita/bebop/list/DefaultListCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/list/DefaultListCellRenderer.java index 8babc2bd9..922c5efd0 100755 --- a/ccm-core/src/com/arsdigita/bebop/list/DefaultListCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/list/DefaultListCellRenderer.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.PageState; * @version $Id: DefaultListCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultListCellRenderer implements ListCellRenderer { - public static final String versionId = "$Id: DefaultListCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Return a component that has been configured to display * the specified value. If isSelected is true, returns a diff --git a/ccm-core/src/com/arsdigita/bebop/list/ListCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/list/ListCellRenderer.java index 5749f7438..0d4e7402c 100755 --- a/ccm-core/src/com/arsdigita/bebop/list/ListCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/list/ListCellRenderer.java @@ -52,8 +52,6 @@ import com.arsdigita.bebop.Component; * @version $Id: ListCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ListCellRenderer { - public static final String versionId = "$Id: ListCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Return a component that has been configured to display the specified * value. That component's generateXML or print diff --git a/ccm-core/src/com/arsdigita/bebop/list/ListModel.java b/ccm-core/src/com/arsdigita/bebop/list/ListModel.java index b55781667..ddd94dd7c 100755 --- a/ccm-core/src/com/arsdigita/bebop/list/ListModel.java +++ b/ccm-core/src/com/arsdigita/bebop/list/ListModel.java @@ -62,8 +62,6 @@ package com.arsdigita.bebop.list; * @version $Id: ListModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ListModel { - public static final String versionId = "$Id: ListModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Move to the next list item. If there is no next list * item, return false. The item's key and element can be diff --git a/ccm-core/src/com/arsdigita/bebop/list/ListModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/list/ListModelBuilder.java index 6c71333e5..e4e544583 100755 --- a/ccm-core/src/com/arsdigita/bebop/list/ListModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/list/ListModelBuilder.java @@ -43,8 +43,6 @@ import com.arsdigita.bebop.List; * @version $Id: ListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ListModelBuilder extends Lockable { - public static final String versionId = "$Id: ListModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Produce a {@link * ListModel} for the request specified by state. This diff --git a/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java b/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java index 78ea2098f..718c375c3 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java +++ b/ccm-core/src/com/arsdigita/bebop/page/BebopApplicationServlet.java @@ -49,10 +49,6 @@ import org.apache.log4j.Logger; * chris gilbert - allow BebopApplicationServlet pages to disable client/middleware */ public class BebopApplicationServlet extends BaseApplicationServlet { - public static final String versionId = - "$Id: BebopApplicationServlet.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (BebopApplicationServlet.class); diff --git a/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java b/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java index 968e19903..42819a3c9 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/page/BebopMapDispatcher.java @@ -35,12 +35,10 @@ import org.xml.sax.helpers.DefaultHandler; * pattern. This class may be used directly by applications, or it * may be subclassed 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 $ */ public class BebopMapDispatcher extends MapDispatcher { - public static final String versionId = - "$Id: BebopMapDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private PresentationManager m_presManager; diff --git a/ccm-core/src/com/arsdigita/bebop/page/PageDispatcher.java b/ccm-core/src/com/arsdigita/bebop/page/PageDispatcher.java index c8e818581..0bf7d9cbd 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/PageDispatcher.java +++ b/ccm-core/src/com/arsdigita/bebop/page/PageDispatcher.java @@ -34,12 +34,10 @@ import org.apache.log4j.Logger; /** * Class for dispatching a single Bebop page object. Generates the * XML output for a Bebop page and renders it with an XSL template. + * + * @version $Id: PageDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PageDispatcher implements Dispatcher { - public static final String versionId = - "$Id: PageDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(PageDispatcher.class); diff --git a/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java b/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java index 3289caadd..f25d66f6b 100755 --- a/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java +++ b/ccm-core/src/com/arsdigita/bebop/page/PageTransformer.java @@ -75,13 +75,9 @@ import org.apache.log4j.Logger; * associated with the package mounted on each site node. * * @author Bill Schneider - * @version $Id: PageTransformer.java 1655 2007-09-18 11:16:54Z chrisg23 $ + * @version $Id: PageTransformer.java 2071 2010-01-28 18:24:06Z pboy $ */ public class PageTransformer implements PresentationManager { - public static final String versionId = - "$Id: PageTransformer.java 1655 2007-09-18 11:16:54Z chrisg23 $" + - "$Author: chrisg23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (PageTransformer.class); diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/ArrayParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/ArrayParameter.java index 5a23dea05..565ce9257 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/ArrayParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/ArrayParameter.java @@ -55,7 +55,6 @@ public class ArrayParameter extends ParameterModel { // Used to escape SEP_CHAR and ESCAPE_CHAR in the marshalled form. private static final char ESCAPE_CHAR = '.'; - public static final String versionId = "$Id: ArrayParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; protected int maxCount=Integer.MAX_VALUE; protected int minCount=0; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/BigDecimalParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/BigDecimalParameter.java index 54d8ad4d2..0d2b82faa 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/BigDecimalParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/BigDecimalParameter.java @@ -23,11 +23,10 @@ import java.math.BigDecimal; /** * A class which represents a BigDecimal + * @version $Id: BigDecimalParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BigDecimalParameter extends ParameterModel { - public static final String versionId = "$Id: BigDecimalParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public BigDecimalParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/BigIntegerParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/BigIntegerParameter.java index 596e91e6e..d84bf906b 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/BigIntegerParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/BigIntegerParameter.java @@ -23,11 +23,10 @@ import java.math.BigInteger; /** * A class which represents a BigInteger + * @version $Id: BigIntegerParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class BigIntegerParameter extends ParameterModel { - public static final String versionId = "$Id: BigIntegerParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public BigIntegerParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/BitSetParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/BitSetParameter.java index 0933d41f3..8c25a85d5 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/BitSetParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/BitSetParameter.java @@ -46,8 +46,6 @@ import java.util.BitSet; */ public class BitSetParameter extends ParameterModel { - public static final String versionId = "$Id: BitSetParameter.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: $"; - /** * The radix used to encode/decode the bitset into a BigInteger */ diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/BooleanParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/BooleanParameter.java index 71648aec6..2e5c2a97c 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/BooleanParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/BooleanParameter.java @@ -30,8 +30,6 @@ import javax.servlet.http.HttpServletRequest; public class BooleanParameter extends ParameterModel { - public static final String versionId = "$Id: BooleanParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public BooleanParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java index b4ed500f2..98df5c470 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/DateInRangeValidationListener.java @@ -32,11 +32,12 @@ import com.arsdigita.bebop.event.ParameterEvent; * @author Karl Goldstein * @author Uday Mathur * @author Stas Freidin - * @author Rory Solomon */ + * @author Rory Solomon + * @version $Id: DateInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DateInRangeValidationListener implements ParameterListener { - public static final String versionId = "$Id: DateInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private final Date m_lowerBound; private final Date m_upperBound; private final String m_baseErrorMsg; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/DateParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/DateParameter.java index f559c14af..7532af7c8 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/DateParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/DateParameter.java @@ -33,8 +33,6 @@ import javax.servlet.http.HttpServletRequest; */ public class DateParameter extends ParameterModel { - public static final String versionId = "$Id: DateParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public DateParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/DoubleParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/DoubleParameter.java index 3520b2219..6a4886923 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/DoubleParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/DoubleParameter.java @@ -28,8 +28,6 @@ package com.arsdigita.bebop.parameters; public class DoubleParameter extends NumberParameter { - public static final String versionId = "$Id: DoubleParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public DoubleParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationParameter.java index 4050a7540..7f4dd2ad4 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationParameter.java @@ -25,12 +25,11 @@ import com.arsdigita.bebop.parameters.EnumerationValidationListener; * * @author Karl Goldstein * @author Uday Mathur - * + * @version $Id: EnumerationParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class EnumerationParameter extends StringParameter { - public static final String versionId = "$Id: EnumerationParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public EnumerationParameter(String name, String[] allowedValues) { super(name); addParameterListener(new EnumerationValidationListener(allowedValues)); diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationValidationListener.java index 2ddcb6565..7127ccf6d 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/EnumerationValidationListener.java @@ -29,12 +29,12 @@ import com.arsdigita.bebop.event.ParameterEvent; * @author Karl Goldstein * @author Uday Mathur * @author Stas Freidin - * @author Rory Solomon */ + * @author Rory Solomon + * @version $Id: EnumerationValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class EnumerationValidationListener implements ParameterListener { - public static final String versionId = "$Id: EnumerationValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final String[] m_allowedValues; private final boolean m_caseSensitive; private final String m_baseErrorMsg; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/FileSizeValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/FileSizeValidationListener.java index 215fd3351..83511fccd 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/FileSizeValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/FileSizeValidationListener.java @@ -40,13 +40,9 @@ import com.arsdigita.globalization.GlobalizedMessage; * and so it may still be possible to bring your server down with an enormous file upload. * but this validation listener can prevent end users being faced with excessively * large downloads - * @version $Revision: 1.1 $ $Author: cgyg9330 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: FileSizeValidationListener.java,v 1.1 2006/02/21 14:43:47 cgyg9330 Exp $ */ public class FileSizeValidationListener extends GlobalizedParameterListener { - public final static String versionId = - "$Id: FileSizeValidationListener.java,v 1.1 2006/02/21 14:43:47 cgyg9330 Exp $" - + "$Author: cgyg9330 $" - + "$DateTime: 2004/08/16 18:10:38 $"; private final long m_maxLength; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/FloatParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/FloatParameter.java index 6e87d4518..59aec523e 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/FloatParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/FloatParameter.java @@ -29,8 +29,6 @@ package com.arsdigita.bebop.parameters; public class FloatParameter extends NumberParameter { - public static final String versionId = "$Id: FloatParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public FloatParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/GlobalizedParameterListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/GlobalizedParameterListener.java index e44657e2d..aa114e3cf 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/GlobalizedParameterListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/GlobalizedParameterListener.java @@ -27,13 +27,11 @@ import com.arsdigita.globalization.GlobalizedMessage; * Abstract class to be extended by globalized parameters. *

* - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: GlobalizedParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class GlobalizedParameterListener implements Globalized, ParameterListener { - public final static String versionId = "$Id: GlobalizedParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final static String BUNDLE_NAME = "com.arsdigita.bebop.parameters.ParameterResources"; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/IntegerParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/IntegerParameter.java index 3ef453c90..e1b305d78 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/IntegerParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/IntegerParameter.java @@ -28,8 +28,6 @@ package com.arsdigita.bebop.parameters; */ public class IntegerParameter extends NumberParameter { - public static final String versionId = "$Id: IntegerParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public IntegerParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/KeywordValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/KeywordValidationListener.java index 0a4bae5c7..0882bbe47 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/KeywordValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/KeywordValidationListener.java @@ -32,12 +32,10 @@ import org.apache.oro.text.perl.Perl5Util; * Note: An empty string will pass the validation tests. * * @author Michael Pih - * @version $Revision: #9 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: KeywordValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class KeywordValidationListener implements ParameterListener { - public static final String versionId = "$Id: KeywordValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // match 1 or more instances of a non-alpha-numeric character private static final String NON_KEYWORD_PATTERN = "/[^a-zA-Z_0-9]+/"; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/LongParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/LongParameter.java index c0efcc8c1..7259f1b9d 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/LongParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/LongParameter.java @@ -28,8 +28,6 @@ package com.arsdigita.bebop.parameters; public class LongParameter extends NumberParameter { - public static final String versionId = "$Id: LongParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public LongParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/NotEmptyValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/NotEmptyValidationListener.java index f6e5caeda..7bcabdec6 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/NotEmptyValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/NotEmptyValidationListener.java @@ -33,14 +33,10 @@ import com.arsdigita.globalization.GlobalizedMessage; * @author Stas Freidin * @author Rory Solomon * @author Bill Schneider + * @version $Id: NotEmptyValidationListener.java 1502 2007-03-20 11:38:53Z chrisgilbert23 $ */ public class NotEmptyValidationListener extends GlobalizedParameterListener { - public static final String versionId = - "$Id: NotEmptyValidationListener.java 1502 2007-03-20 11:38:53Z chrisgilbert23 $" + - "by $Author: chrisgilbert23 $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - public NotEmptyValidationListener(String label) { setError(new GlobalizedMessage(label, getBundleBaseName())); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/NotNullValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/NotNullValidationListener.java index cfed91941..657d0ee92 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/NotNullValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/NotNullValidationListener.java @@ -30,11 +30,10 @@ import com.arsdigita.globalization.GlobalizedMessage; * @author Uday Mathur * @author Stas Freidin * @author Rory Solomon + * @version $Id: NotNullValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class NotNullValidationListener extends GlobalizedParameterListener { - public static final String versionId = "$Id: NotNullValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final NotNullValidationListener DEFAULT = new NotNullValidationListener(); public NotNullValidationListener(String title) { diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/NumberInRangeValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/NumberInRangeValidationListener.java index e4af51ee9..69400e97d 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/NumberInRangeValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/NumberInRangeValidationListener.java @@ -30,11 +30,11 @@ import com.arsdigita.bebop.event.ParameterEvent; * @author Karl Goldstein * @author Uday Mathur * @author Stas Freidin - * @author Rory Solomon */ + * @author Rory Solomon + * @version $Id: NumberInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class NumberInRangeValidationListener implements ParameterListener { - public static final String versionId = "$Id: NumberInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final double m_lowerBound; private final double m_upperBound; private final String m_baseErrorMsg; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/NumberParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/NumberParameter.java index f80acd0cb..b6d84c040 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/NumberParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/NumberParameter.java @@ -29,8 +29,6 @@ import javax.servlet.http.HttpServletRequest; */ public class NumberParameter extends ParameterModel { - public static final String versionId = "$Id: NumberParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public NumberParameter(String name) { super(name); try { diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/ParameterData.java b/ccm-core/src/com/arsdigita/bebop/parameters/ParameterData.java index a6584cf0f..92cf191d6 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/ParameterData.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/ParameterData.java @@ -34,8 +34,6 @@ import com.arsdigita.globalization.GlobalizedMessage; */ public final class ParameterData implements Map.Entry, Cloneable { - public static final String versionId = "$Id: ParameterData.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Value associated with this ParameterData. This value is null if * ParameterModel.transformValue() fails. diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/ParameterModel.java b/ccm-core/src/com/arsdigita/bebop/parameters/ParameterModel.java index 480a9ea6c..ebcc70331 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/ParameterModel.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/ParameterModel.java @@ -46,21 +46,26 @@ public abstract class ParameterModel implements Lockable { * exception if the specified name is null */ protected String m_name; + /** * The default value of this ParameterModel. This value is used when * the request is not a submission, and the transformValue returns * null. */ protected Object m_defaultValue; + /** * A List of Listeners to validate this parameter. */ protected List m_parameterListeners; + /** - * A boolean indicating if this ParameterModel is isLocked, as per the + * A boolean indicating if this ParameterModel is locked, as per the * Lockable interface */ protected boolean m_locked; + + /** * true if the parameter value in a request should be set * to the default value when it would ordinarily be set @@ -72,9 +77,11 @@ public abstract class ParameterModel implements Lockable { * This defaults to true. */ private boolean m_defaultOverridesNull = false; + private boolean m_passIn = true; + private static final Logger s_log = - Logger.getLogger(ParameterModel.class.getName()); + Logger.getLogger(ParameterModel.class.getName()); /** * Construct an unlocked ParameterModel @@ -183,7 +190,7 @@ public abstract class ParameterModel implements Lockable { /** * Sets the name of this ParmeterModel. - * Asserts that this ParameterModel is not isLocked. + * Asserts that this ParameterModel is not locked. * * @param name The name of this parameter model. */ @@ -196,7 +203,7 @@ public abstract class ParameterModel implements Lockable { * Adds a validation listener, implementing a custom validation * check that applies to this Parameter. Useful for checks that * require examination of the values of only this parameter. - * Asserts that this ParameterModel is not isLocked. + * Asserts that this ParameterModel is not locked. * * @param listener An instance of a class that implements the * FormValidationListener interface. @@ -210,7 +217,7 @@ public abstract class ParameterModel implements Lockable { * Sets a default value for this parameter. This default value is * superceded by values set in the initialization listeners and in * the request object. - * Asserts that this ParameterModel is not isLocked. + * Asserts that this ParameterModel is not locked. * * @param defaultValue a default value for this parameter that * appears if there is no value in the request or specified by an @@ -269,6 +276,7 @@ public abstract class ParameterModel implements Lockable { return createParameterData(request, null, false); } + /** * Create a ParameterData for this ParameterModel with the supplied * request If this tranformation throws an exception, mark the @@ -311,8 +319,8 @@ public abstract class ParameterModel implements Lockable { * null values from the submission. */ public ParameterData createParameterData(HttpServletRequest request, - Object defaultValue, - boolean isSubmission) { + Object defaultValue, + boolean isSubmission) { // This method can work in one of two modes, which influences how // default values are used. // (0) if transformValue() returns null, we *always* try @@ -382,7 +390,7 @@ public abstract class ParameterModel implements Lockable { /** * Lock the model, blocking any further modifications. Cached form - * models should always be isLocked to ensure that they remain + * models should always be locked to ensure that they remain * unchanged across requests. */ public synchronized void lock() { @@ -442,7 +450,8 @@ public abstract class ParameterModel implements Lockable { * @pre encoded != null */ public Object unmarshal(String encoded) { - throw new UnsupportedOperationException("Not implemented. " + "This method needs to be implemented by the specific subclasses."); + throw new UnsupportedOperationException("Not implemented. " + + "This method needs to be implemented by the specific subclasses."); } /** @@ -459,7 +468,7 @@ public abstract class ParameterModel implements Lockable { } /** - * @return true if this ParameterModel is isLocked to prevent + * @return true if this ParameterModel is locked to prevent * modification. */ public boolean isLocked() { diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/StringInRangeValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/StringInRangeValidationListener.java index fbc5ed82a..c807f9ecf 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/StringInRangeValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/StringInRangeValidationListener.java @@ -30,12 +30,10 @@ import com.arsdigita.util.Assert; * Check that a string's length falls into a particular range. *

* - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: StringInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class StringInRangeValidationListener extends GlobalizedParameterListener { - public static final String versionId = "$Id: StringInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final int m_minLength; private final int m_maxLength; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/StringIsLettersOrDigitsValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/StringIsLettersOrDigitsValidationListener.java index f920d87c6..0ec6dee2d 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/StringIsLettersOrDigitsValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/StringIsLettersOrDigitsValidationListener.java @@ -28,13 +28,11 @@ import com.arsdigita.globalization.GlobalizedMessage; * parameter's value contains only letters and/or digits. * * @author Dennis Gregorovic - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: StringIsLettersOrDigitsValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class StringIsLettersOrDigitsValidationListener extends GlobalizedParameterListener { - public static final String versionId = "$Id: StringIsLettersOrDigitsValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public StringIsLettersOrDigitsValidationListener(String title) { setError(new GlobalizedMessage(title, getBundleBaseName())); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/StringLengthValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/StringLengthValidationListener.java index ae1a82341..ecbc9cdc8 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/StringLengthValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/StringLengthValidationListener.java @@ -26,16 +26,12 @@ import com.arsdigita.util.Assert; /** * Verifies that the - * string length is less than or isEqual to the specified value + * string length is less than or equal to the specified value * * @author Stanislav Freidin - * @version $Revision: #10 $ $Author: sskracic $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: StringLengthValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public class StringLengthValidationListener implements ParameterListener { - public final static String versionId = - "$Id: StringLengthValidationListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private final int m_maxLength; private final String m_errHead; diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/TrimmedStringParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/TrimmedStringParameter.java index 7856393cd..b01f230e0 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/TrimmedStringParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/TrimmedStringParameter.java @@ -28,11 +28,10 @@ import javax.servlet.http.HttpServletRequest; * * @author Karl Goldstein * @author Uday Mathur - * @version $Id: TrimmedStringParameter.java 287 2005-02-22 00:29:02Z sskracic $ */ + * @version $Id: TrimmedStringParameter.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class TrimmedStringParameter extends StringParameter { - public static final String versionId = "$Id: TrimmedStringParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public TrimmedStringParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/TypeCheckValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/TypeCheckValidationListener.java index 292197580..5f6403a40 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/TypeCheckValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/TypeCheckValidationListener.java @@ -29,10 +29,11 @@ import com.arsdigita.globalization.GlobalizedMessage; * @author Karl Goldstein * @author Uday Mathur * @author Stas Freidin - * @author Rory Solomon */ + * @author Rory Solomon + * @version $Id: TypeCheckValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class TypeCheckValidationListener extends GlobalizedParameterListener { - public static final String versionId = "$Id: TypeCheckValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Class m_type; public TypeCheckValidationListener(Class type) { diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/URLParameter.java b/ccm-core/src/com/arsdigita/bebop/parameters/URLParameter.java index cd9af0271..eb8925b5c 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/URLParameter.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/URLParameter.java @@ -33,8 +33,6 @@ import javax.servlet.http.HttpServletRequest; */ public class URLParameter extends StringParameter { - public static final String versionId = "$Id: URLParameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public URLParameter(String name) { super(name); } diff --git a/ccm-core/src/com/arsdigita/bebop/parameters/URLTokenValidationListener.java b/ccm-core/src/com/arsdigita/bebop/parameters/URLTokenValidationListener.java index 04a4b1979..7e0afd4fb 100755 --- a/ccm-core/src/com/arsdigita/bebop/parameters/URLTokenValidationListener.java +++ b/ccm-core/src/com/arsdigita/bebop/parameters/URLTokenValidationListener.java @@ -32,12 +32,10 @@ import org.apache.oro.text.perl.Perl5Util; * Note: An empty string will pass the validation tests. * * @author Michael Pih - * @version $Revision: #9 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: URLTokenValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class URLTokenValidationListener implements ParameterListener { - public static final String versionId = "$Id: URLTokenValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // match 1 or more instances of a non-alpha-numeric character private static final String NON_KEYWORD_PATTERN = "/[^a-zA-Z_0-9\\-]+/"; diff --git a/ccm-core/src/com/arsdigita/bebop/portal/Portal.java b/ccm-core/src/com/arsdigita/bebop/portal/Portal.java index faa7a9671..b86199db9 100755 --- a/ccm-core/src/com/arsdigita/bebop/portal/Portal.java +++ b/ccm-core/src/com/arsdigita/bebop/portal/Portal.java @@ -95,10 +95,6 @@ import java.util.Iterator; * @author James Parsons * @version $Id: Portal.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Portal extends SimpleContainer implements BebopConstants { - public static final String versionId = - "$Id: Portal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(Portal.class.getName()); diff --git a/ccm-core/src/com/arsdigita/bebop/portal/PortalModel.java b/ccm-core/src/com/arsdigita/bebop/portal/PortalModel.java index 27833ea85..ad1be93e5 100755 --- a/ccm-core/src/com/arsdigita/bebop/portal/PortalModel.java +++ b/ccm-core/src/com/arsdigita/bebop/portal/PortalModel.java @@ -35,7 +35,6 @@ import java.util.Iterator; * @version $Id: PortalModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface PortalModel { - public static final String versionId = "$Id: PortalModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Get the {@link Portlet}s of this PortalModel. Users of the diff --git a/ccm-core/src/com/arsdigita/bebop/portal/PortalModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/portal/PortalModelBuilder.java index 5e0c4eb5b..82c85ca58 100755 --- a/ccm-core/src/com/arsdigita/bebop/portal/PortalModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/portal/PortalModelBuilder.java @@ -34,9 +34,10 @@ import com.arsdigita.bebop.PageState; * @see PortletRenderer * @see AbstractPortletRenderer * @author Justin Ross - * @author James Parsons */ + * @author James Parsons + * @version $Id: PortalModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface PortalModelBuilder { - public static final String versionId = "$Id: PortalModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Build a {@link PortalModel} for the current request. diff --git a/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java b/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java index e484f6a67..dd907d324 100755 --- a/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java +++ b/ccm-core/src/com/arsdigita/bebop/portal/Portlet.java @@ -44,10 +44,6 @@ import com.arsdigita.xml.Element; public class Portlet extends SimpleContainer implements PortletRenderer, BebopConstants { - public static final String versionId = - "$Id: Portlet.java 902 2005-09-22 04:57:12Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/16 18:10:38 $"; private String m_title = ""; private int m_cellNumber = 1; diff --git a/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java b/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java index 4cb79ffea..adfcac07a 100755 --- a/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/portal/PortletRenderer.java @@ -48,7 +48,6 @@ import com.arsdigita.xml.Element; * @author James Parsons * @version $Id: PortletRenderer.java 902 2005-09-22 04:57:12Z apevec $ */ public interface PortletRenderer { - public static final String versionId = "$Id: PortletRenderer.java 902 2005-09-22 04:57:12Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; /** * Build an XML fragment and attach it to this component's parent. diff --git a/ccm-core/src/com/arsdigita/bebop/table/AbstractTableModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/table/AbstractTableModelBuilder.java index bdcc5850d..9f8cf7663 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/AbstractTableModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/table/AbstractTableModelBuilder.java @@ -38,8 +38,6 @@ import com.arsdigita.util.LockableImpl; public abstract class AbstractTableModelBuilder extends LockableImpl implements TableModelBuilder { - public static final String versionId = "$Id: AbstractTableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Return a table model for the request represented by * s. The table model contains all the data that is to be diff --git a/ccm-core/src/com/arsdigita/bebop/table/DefaultTableCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/table/DefaultTableCellRenderer.java index b97852afa..a5b871a59 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/DefaultTableCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/table/DefaultTableCellRenderer.java @@ -58,8 +58,6 @@ import com.arsdigita.util.LockableImpl; public class DefaultTableCellRenderer extends LockableImpl implements TableCellRenderer { - public static final String versionId = "$Id: DefaultTableCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private boolean m_active; private ThreadLocal m_label; private ThreadLocal m_controlLink; diff --git a/ccm-core/src/com/arsdigita/bebop/table/DefaultTableColumnModel.java b/ccm-core/src/com/arsdigita/bebop/table/DefaultTableColumnModel.java index 09785223d..4a6732b11 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/DefaultTableColumnModel.java +++ b/ccm-core/src/com/arsdigita/bebop/table/DefaultTableColumnModel.java @@ -34,8 +34,6 @@ import com.arsdigita.util.Assert; */ public class DefaultTableColumnModel implements TableColumnModel { - public static final String versionId = "$Id: DefaultTableColumnModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final String SELECTED_COLUMN="col"; private boolean m_locked; diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/table/TableCellRenderer.java index d58c5a8dc..a60a94df2 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableCellRenderer.java @@ -74,8 +74,6 @@ import com.arsdigita.bebop.Table; */ public interface TableCellRenderer { - public static final String versionId = "$Id: TableCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Return a component with the visual representation for the passed in * key and value. diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableColumn.java b/ccm-core/src/com/arsdigita/bebop/table/TableColumn.java index 9dd6d3459..7f98bcdf9 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableColumn.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableColumn.java @@ -60,9 +60,8 @@ import com.arsdigita.xml.Element; * * @version $Id: TableColumn.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TableColumn extends SimpleComponent - implements Lockable { + implements Lockable { - public static final String versionId = "$Id: TableColumn.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * The name of the width attribute used in the XML. @@ -116,7 +115,7 @@ public class TableColumn extends SimpleComponent /** * Creates a new table column with modelIndex 0 and header - * value and key isEqual to null. + * value and key equal to null. */ public TableColumn() { this(0); @@ -124,7 +123,7 @@ public class TableColumn extends SimpleComponent /** * Creates a new table column with the given modelIndex and - * header value and key isEqual to null. + * header value and key equal to null. * * @param modelIndex the index of the column in the table model from * which to retrieve values @@ -136,10 +135,10 @@ public class TableColumn extends SimpleComponent /** * Creates a new table column with the given modelIndex and - * header value. The header key is isEqual to null. + * header value. The header key is equal to null. * * @param modelIndex the index of the column in the table model from - * which to retrieve values. + * which to retrieve values. * @param value the value for the column header. * @pre modelIndex >= 0 */ @@ -152,7 +151,7 @@ public class TableColumn extends SimpleComponent * header value and key. * * @param modelIndex the index of the column in the table model from - * which to retrieve values. + * which to retrieve values. * @param value the value for the column header. * @param key the key for the column header. * @pre modelIndex >= 0 diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableColumnModel.java b/ccm-core/src/com/arsdigita/bebop/table/TableColumnModel.java index 980365a1c..cf0a39068 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableColumnModel.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableColumnModel.java @@ -31,7 +31,6 @@ import com.arsdigita.util.Lockable; */ public interface TableColumnModel extends Lockable { - public static final String versionId = "$Id: TableColumnModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; void add(TableColumn column); diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java b/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java index aff17b9c8..1aef68e30 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableHeader.java @@ -44,7 +44,6 @@ import com.arsdigita.xml.Element; */ public class TableHeader extends SimpleComponent { - public static final String versionId = "$Id: TableHeader.java 1638 2007-09-17 11:48:34Z chrisg23 $ by $Author: chrisg23 $, $DateTime: 2004/08/16 18:10:38 $"; /** * The control event when the user clicks on a column header. diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableModel.java b/ccm-core/src/com/arsdigita/bebop/table/TableModel.java index 4ff5af794..b3a966ea1 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableModel.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableModel.java @@ -48,7 +48,6 @@ package com.arsdigita.bebop.table; * @version $Id: TableModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface TableModel { - public static final String versionId = "$Id: TableModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Return the number of columns this table model has. diff --git a/ccm-core/src/com/arsdigita/bebop/table/TableModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/table/TableModelBuilder.java index f29633784..13e303e81 100755 --- a/ccm-core/src/com/arsdigita/bebop/table/TableModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/table/TableModelBuilder.java @@ -47,7 +47,6 @@ import com.arsdigita.util.Lockable; */ public interface TableModelBuilder extends Lockable { - public static final String versionId = "$Id: TableModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Return a table model for the request represented by diff --git a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeCellRenderer.java index b94330c7b..9cd07e396 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeCellRenderer.java @@ -37,7 +37,6 @@ import com.arsdigita.bebop.Tree; * @version $Id: DefaultTreeCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultTreeCellRenderer implements TreeCellRenderer { - public static final String versionId = "$Id: DefaultTreeCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Returns node component to be displayed. The component's * generateXML or print is called diff --git a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeModel.java b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeModel.java index 64d7d8463..2cd19edc8 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeModel.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeModel.java @@ -34,7 +34,6 @@ import java.util.Iterator; * @version $Id: DefaultTreeModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultTreeModel implements TreeModel { - public static final String versionId = "$Id: DefaultTreeModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private TreeNode rootTreeNode; private boolean _hasChildren; diff --git a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeNode.java b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeNode.java index dd53c545f..03c2eb78d 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeNode.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/DefaultTreeNode.java @@ -29,7 +29,6 @@ package com.arsdigita.bebop.tree; * @version $Id: DefaultTreeNode.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DefaultTreeNode implements TreeNode { - public static final String versionId = "$Id: DefaultTreeNode.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Object m_key; private Object m_element; diff --git a/ccm-core/src/com/arsdigita/bebop/tree/TreeCellRenderer.java b/ccm-core/src/com/arsdigita/bebop/tree/TreeCellRenderer.java index 170a0d376..4e67bf22f 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/TreeCellRenderer.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/TreeCellRenderer.java @@ -35,7 +35,6 @@ import com.arsdigita.bebop.Tree; * @version $Id: TreeCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface TreeCellRenderer { - public static final String versionId = "$Id: TreeCellRenderer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Returns node component to be displayed. The component's * generateXML or print is called diff --git a/ccm-core/src/com/arsdigita/bebop/tree/TreeModel.java b/ccm-core/src/com/arsdigita/bebop/tree/TreeModel.java index 1906dd710..1e908421a 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/TreeModel.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/TreeModel.java @@ -32,7 +32,6 @@ import java.util.Iterator; * @version $Id: TreeModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface TreeModel { - public static final String versionId = "$Id: TreeModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Obtain the root node of the tree, passing diff --git a/ccm-core/src/com/arsdigita/bebop/tree/TreeModelBuilder.java b/ccm-core/src/com/arsdigita/bebop/tree/TreeModelBuilder.java index 56e7d7903..44a85f781 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/TreeModelBuilder.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/TreeModelBuilder.java @@ -31,7 +31,6 @@ import com.arsdigita.util.Lockable; * @version $Id: TreeModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface TreeModelBuilder extends Lockable { - public static final String versionId = "$Id: TreeModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Builds a {@link TreeModel} to be used in the current request diff --git a/ccm-core/src/com/arsdigita/bebop/tree/TreeNode.java b/ccm-core/src/com/arsdigita/bebop/tree/TreeNode.java index b3b363920..fca1406eb 100755 --- a/ccm-core/src/com/arsdigita/bebop/tree/TreeNode.java +++ b/ccm-core/src/com/arsdigita/bebop/tree/TreeNode.java @@ -33,7 +33,6 @@ package com.arsdigita.bebop.tree; * @version $Id: TreeNode.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface TreeNode { - public static final String versionId = "$Id: TreeNode.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Obtain a unique ID representing the node diff --git a/ccm-core/src/com/arsdigita/bebop/util/Attributes.java b/ccm-core/src/com/arsdigita/bebop/util/Attributes.java index 185f7598a..192a0caa2 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/Attributes.java +++ b/ccm-core/src/com/arsdigita/bebop/util/Attributes.java @@ -34,7 +34,6 @@ import java.util.Collection; */ public class Attributes implements Lockable, Cloneable { - public static final String versionId = "$Id: Attributes.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Map of attributes. */ @@ -51,7 +50,7 @@ public class Attributes implements Lockable, Cloneable { } /** - * Clone the attributes. The clone is not isLocked and has its own set of + * Clone the attributes. The clone is not locked and has its own set of * attributes and values. * @post ! ((Attributes) return).isLocked() */ diff --git a/ccm-core/src/com/arsdigita/bebop/util/BebopConstants.java b/ccm-core/src/com/arsdigita/bebop/util/BebopConstants.java index cfdf0832a..cf8afabe0 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/BebopConstants.java +++ b/ccm-core/src/com/arsdigita/bebop/util/BebopConstants.java @@ -27,10 +27,6 @@ package com.arsdigita.bebop.util; * @version $Id: BebopConstants.java 1224 2006-06-18 22:28:30Z apevec $ */ public interface BebopConstants { - public static final String versionId = - "$Id: BebopConstants.java 1224 2006-06-18 22:28:30Z apevec $" + - " by $Author: apevec $, " + - "$DateTime: 2004/08/16 18:10:38 $"; String BEBOP_CHECKBOXGROUP = "bebop:checkboxGroup"; String BEBOP_CHECKBOX = "bebop:checkbox"; diff --git a/ccm-core/src/com/arsdigita/bebop/util/Color.java b/ccm-core/src/com/arsdigita/bebop/util/Color.java index 7c552a95f..8556d03bf 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/Color.java +++ b/ccm-core/src/com/arsdigita/bebop/util/Color.java @@ -47,7 +47,6 @@ package com.arsdigita.bebop.util; public class Color { - public static final String versionId = "$Id: Color.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private int m_red = 255; private int m_green = 255; private int m_blue = 255; diff --git a/ccm-core/src/com/arsdigita/bebop/util/Lockable.java b/ccm-core/src/com/arsdigita/bebop/util/Lockable.java.nolongerInUse similarity index 86% rename from ccm-core/src/com/arsdigita/bebop/util/Lockable.java rename to ccm-core/src/com/arsdigita/bebop/util/Lockable.java.nolongerInUse index 8783a812a..9e2b218e9 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/Lockable.java +++ b/ccm-core/src/com/arsdigita/bebop/util/Lockable.java.nolongerInUse @@ -21,5 +21,4 @@ package com.arsdigita.bebop.util; /** @deprecated Use {@link com.arsdigita.util.Lockable} instead. */ public interface Lockable extends com.arsdigita.util.Lockable { - public static final String versionId = "$Id: Lockable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; } diff --git a/ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java b/ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java.nolongerInUse similarity index 85% rename from ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java rename to ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java.nolongerInUse index c7449f712..e68990173 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java +++ b/ccm-core/src/com/arsdigita/bebop/util/LockableImpl.java.nolongerInUse @@ -23,5 +23,4 @@ package com.arsdigita.bebop.util; **/ public class LockableImpl extends com.arsdigita.util.LockableImpl { - public static final String versionId = "$Id: LockableImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; } diff --git a/ccm-core/src/com/arsdigita/bebop/util/SequentialMap.java b/ccm-core/src/com/arsdigita/bebop/util/SequentialMap.java index 46982d30a..489b94f7d 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/SequentialMap.java +++ b/ccm-core/src/com/arsdigita/bebop/util/SequentialMap.java @@ -35,7 +35,6 @@ package com.arsdigita.bebop.util; */ public class SequentialMap extends com.arsdigita.util.SequentialMap { - public static final String versionId = "$Id: SequentialMap.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Creates an empty SequentialMap. diff --git a/ccm-core/src/com/arsdigita/bebop/util/Size.java b/ccm-core/src/com/arsdigita/bebop/util/Size.java index 72bf230f1..176d90c4f 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/Size.java +++ b/ccm-core/src/com/arsdigita/bebop/util/Size.java @@ -45,7 +45,6 @@ package com.arsdigita.bebop.util; */ public class Size { - public static final String versionId = "$Id: Size.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private float m_scalar; private String m_unitAbbreviation = ""; diff --git a/ccm-core/src/com/arsdigita/bebop/util/Traversal.java b/ccm-core/src/com/arsdigita/bebop/util/Traversal.java index c2190f919..be55c4130 100755 --- a/ccm-core/src/com/arsdigita/bebop/util/Traversal.java +++ b/ccm-core/src/com/arsdigita/bebop/util/Traversal.java @@ -59,7 +59,6 @@ public abstract class Traversal { */ public final static int SKIP_SUBTREE = 2; - public static final String versionId = "$Id: Traversal.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Set m_visiting = null; diff --git a/ccm-core/src/com/arsdigita/caching/CacheEntryRemovalEvent.java b/ccm-core/src/com/arsdigita/caching/CacheEntryRemovalEvent.java index e528f4e3a..ec3fb8647 100755 --- a/ccm-core/src/com/arsdigita/caching/CacheEntryRemovalEvent.java +++ b/ccm-core/src/com/arsdigita/caching/CacheEntryRemovalEvent.java @@ -27,19 +27,14 @@ import com.arsdigita.bebop.PageState; * should be created. However, if object creation is a time consuming process, then we * may not want the user to be hit by this and so a listener can replace the entry when * it has been invalidated from another node. - * - * @author Chris Gilbert chris.gilbert@westsussex.gov.uk - * - * @version $Id: CacheEntryRemovalEvent 285 2005-02-22 00:29:02Z cgyg9330 $ * * @see CacheEntryRemovalListener * + * @author Chris Gilbert chris.gilbert@westsussex.gov.uk + * @version $Id: CacheEntryRemovalEvent 285 2005-02-22 00:29:02Z cgyg9330 $ */ - public class CacheEntryRemovalEvent { - public static final String versionId = "$Id: CacheEntryRemovalEvent.java 285 2005-02-22 00:29:02Z cgyg9330 $ by $Author: cgyg9330 $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String STALE_ENTRY = "stale"; public static final String INVALIDATED_ENTRY = "invalid"; public static final String CACHE_FULL_LRU = "lru"; diff --git a/ccm-core/src/com/arsdigita/categorization/CategorizationConfig.java b/ccm-core/src/com/arsdigita/categorization/CategorizationConfig.java index a94ae95ea..aca2de28c 100644 --- a/ccm-core/src/com/arsdigita/categorization/CategorizationConfig.java +++ b/ccm-core/src/com/arsdigita/categorization/CategorizationConfig.java @@ -41,12 +41,9 @@ import org.apache.log4j.Logger; * Stores the configuration record for the Categorization functionality. * * @author Sören Bernstein (quasimodo) quasi@zes.uni-bremen.de + * @version $Id: CategorizationConfig.java 1169 2008-06-05 16:08:25Z quasimodo $ */ public final class CategorizationConfig extends AbstractConfig { - public static final String versionId = - "$Id: CategorizationConfig.java 1169 2008-06-05 16:08:25Z quasimodo $" + - "$Author: quasimodo $" + - "$DateTime: 2008/06/05 16:08:25 $"; private static Logger s_log = Logger.getLogger(CategorizationConfig.class); diff --git a/ccm-core/src/com/arsdigita/categorization/Category.java b/ccm-core/src/com/arsdigita/categorization/Category.java index 7dc4576a2..4ee4eb4e6 100755 --- a/ccm-core/src/com/arsdigita/categorization/Category.java +++ b/ccm-core/src/com/arsdigita/categorization/Category.java @@ -128,7 +128,7 @@ public class Category extends ACSObject { s_config.load(); } // Quasimodo: End - + public static final String ROOT_CATEGORY = "rootCategory"; public static final String USE_CONTEXT = "useContext"; public static final String CATEGORY_OWNER = "categoryOwner"; @@ -175,7 +175,7 @@ public class Category extends ACSObject { public final static String CHILD_OBJECTS = "childObjects"; public final static String RELATED_CATEGORIES = RELATED; public final static String CATEGORIES = "categories"; - + public static final String LOCALIZATIONS = "localizations"; // some named queries in the pdl files @@ -190,7 +190,7 @@ public class Category extends ACSObject { // Save the localized parts of category private CategoryLocalizationCollection m_categoryLocalizationCollection; // Quasimodo: End - + protected String getBaseDataObjectType() { return BASE_DATA_OBJECT_TYPE; } @@ -357,7 +357,7 @@ public class Category extends ACSObject { public static CategorizationConfig getConfig() { return s_config; } - + /** * @see com.arsdigita.domain.DomainObject#initialize() */ @@ -376,13 +376,13 @@ public class Category extends ACSObject { setAbstract(false); //by default do not ignore the parent index item setIgnoreParentIndexItem(false); - + } - + m_hierarchy = new HierarchyDenormalization ("com.arsdigita.categorization.updateCategoryDescendants", this, DEFAULT_ANCESTORS) {}; - + m_categoryLocalizationCollection = new CategoryLocalizationCollection(this); } @@ -673,7 +673,7 @@ public class Category extends ACSObject { } - + /** * Sets the URL component of the category. * @@ -2200,7 +2200,7 @@ public class Category extends ACSObject { (new PermissionDescriptor(PrivilegeDescriptor.ADMIN, this, Kernel.getContext().getParty())); } - + // Quasimodo: Begin /** * Getting the negotiated locale from requestContext diff --git a/ccm-core/src/com/arsdigita/categorization/ui/ACSObjectCategorySummary.java b/ccm-core/src/com/arsdigita/categorization/ui/ACSObjectCategorySummary.java index 9209dfa4e..722084ba2 100755 --- a/ccm-core/src/com/arsdigita/categorization/ui/ACSObjectCategorySummary.java +++ b/ccm-core/src/com/arsdigita/categorization/ui/ACSObjectCategorySummary.java @@ -48,6 +48,8 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.web.RedirectSignal; import com.arsdigita.xml.Element; import com.arsdigita.xml.XML; + + /** * abstract class for displaying the categories assigned to an object under one or * more root nodes. Subclasses should retrieve the object to be assigned and diff --git a/ccm-core/src/com/arsdigita/db/GenericSequenceImpl.java b/ccm-core/src/com/arsdigita/db/GenericSequenceImpl.java index a337d6b69..74ed8b6b9 100755 --- a/ccm-core/src/com/arsdigita/db/GenericSequenceImpl.java +++ b/ccm-core/src/com/arsdigita/db/GenericSequenceImpl.java @@ -30,13 +30,12 @@ import java.util.HashMap; * that don't support Oracle style sequences. * * @author Kevin Scaldeferri + * @version $Id: GenericSequenceImpl.java 287 2005-02-22 00:29:02Z sskracic $ */ public class GenericSequenceImpl extends SequenceImpl { - public static final String versionId = "$Id: GenericSequenceImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /* This is a pseudo-Singleton implementation. We create a * single instance for each sequence. */ diff --git a/ccm-core/src/com/arsdigita/db/SequenceImpl.java b/ccm-core/src/com/arsdigita/db/SequenceImpl.java index ebf6e2357..cec415983 100755 --- a/ccm-core/src/com/arsdigita/db/SequenceImpl.java +++ b/ccm-core/src/com/arsdigita/db/SequenceImpl.java @@ -30,12 +30,11 @@ import java.sql.SQLException; * appropriate to a given database * * @author Kevin Scaldeferri + * @version $Id: SequenceImpl.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class SequenceImpl { - public static final String versionId = "$Id: SequenceImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public abstract BigDecimal getCurrentValue(Connection conn) throws SQLException; diff --git a/ccm-core/src/com/arsdigita/db/Sequences.java b/ccm-core/src/com/arsdigita/db/Sequences.java index e26404dca..e09164384 100755 --- a/ccm-core/src/com/arsdigita/db/Sequences.java +++ b/ccm-core/src/com/arsdigita/db/Sequences.java @@ -42,7 +42,6 @@ import org.apache.log4j.Logger; public class Sequences { - public static final String versionId = "$Id: Sequences.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Sequences.class); diff --git a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupport.java b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupport.java index 0157ae757..c6fcd42ab 100755 --- a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupport.java +++ b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupport.java @@ -30,10 +30,9 @@ import java.util.HashMap; * for this information. * * @author Joseph A. Bank (jbank@alum.mit.edu) - * @version 1.0 + * @version $Id: DeveloperSupport.java 1460 2007-03-02 14:36:38Z sskracic $ **/ public class DeveloperSupport { - public static final String versionId = "$Id: DeveloperSupport.java 1460 2007-03-02 14:36:38Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private DeveloperSupport() { } //you can't create me! diff --git a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportListener.java b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportListener.java index fdeea8682..0c035a336 100755 --- a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportListener.java +++ b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportListener.java @@ -23,10 +23,9 @@ import java.util.HashMap; /** * * @author Joseph A. Bank (jbank@alum.mit.edu) - * @version 1.0 + * @version $Id: DeveloperSupportListener.java 1460 2007-03-02 14:36:38Z sskracic $ **/ public abstract class DeveloperSupportListener { - public static final String versionId = "$Id: DeveloperSupportListener.java 1460 2007-03-02 14:36:38Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * requestStart diff --git a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java index 9003debe7..a13a2b931 100755 --- a/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java +++ b/ccm-core/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java @@ -30,12 +30,11 @@ import java.util.HashMap; * DeveloperSupportProfiler * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: DeveloperSupportProfiler.java 1498 2007-03-19 16:22:15Z apevec $ **/ public class DeveloperSupportProfiler implements RDBMSProfiler { - public final static String versionId = "$Id: DeveloperSupportProfiler.java 1498 2007-03-19 16:22:15Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; public DeveloperSupportProfiler() {} diff --git a/ccm-core/src/com/arsdigita/dispatcher/AbortRequestSignal.java b/ccm-core/src/com/arsdigita/dispatcher/AbortRequestSignal.java index 0437a2744..4c45bce01 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/AbortRequestSignal.java +++ b/ccm-core/src/com/arsdigita/dispatcher/AbortRequestSignal.java @@ -26,7 +26,6 @@ package com.arsdigita.dispatcher; */ public class AbortRequestSignal extends Error { - public static final String versionId = "$Id: AbortRequestSignal.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // extending error is a bit of a misnomer but it's what // we want: an unchecked exception that won't get caught diff --git a/ccm-core/src/com/arsdigita/dispatcher/AccessDeniedException.java b/ccm-core/src/com/arsdigita/dispatcher/AccessDeniedException.java index 2f5b68e5d..c7e1a40a3 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/AccessDeniedException.java +++ b/ccm-core/src/com/arsdigita/dispatcher/AccessDeniedException.java @@ -26,11 +26,10 @@ import javax.servlet.http.HttpServletRequest; * whenever the current user does not have access to the requested resources. * * @author Michael Pih - * @version $Revision: #9 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: AccessDeniedException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AccessDeniedException extends RuntimeException { - public final static String versionId = "$Id: AccessDeniedException.java 287 2005-02-22 00:29:02Z sskracic $ $Author: sskracic $ $DateTime"; public final static String ACCESS_DENIED = "com.arsdigita.cms.dispatcher.AccessDeniedException"; diff --git a/ccm-core/src/com/arsdigita/dispatcher/BaseDispatcherServlet.java b/ccm-core/src/com/arsdigita/dispatcher/BaseDispatcherServlet.java index b9fdfd3d1..0b9e907ed 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/BaseDispatcherServlet.java +++ b/ccm-core/src/com/arsdigita/dispatcher/BaseDispatcherServlet.java @@ -78,13 +78,10 @@ import org.xml.sax.helpers.DefaultHandler; * * * @author Bill Schneider - * @version ACS 4.5 - * @since 4.5 - **/ + * @version $Id: BaseDispatcherServlet.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class BaseDispatcherServlet extends HttpServlet implements Dispatcher, DispatcherConstants { - public static final String versionId = - "$Id: BaseDispatcherServlet.java 287 2005-02-22 00:29:02Z sskracic $"; private static final Logger s_log = Logger.getLogger (BaseDispatcherServlet.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/ChainedDispatcher.java b/ccm-core/src/com/arsdigita/dispatcher/ChainedDispatcher.java index cbaca737a..be961abea 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/ChainedDispatcher.java +++ b/ccm-core/src/com/arsdigita/dispatcher/ChainedDispatcher.java @@ -54,13 +54,11 @@ import javax.servlet.http.HttpServletResponse; * applications. * * @author Bill Schneider - * @version $Revision: #10 $ $Date: 2004/08/16 $ - * @since 4.6.6 + * @version $Id: ChainedDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ChainedDispatcher { - public final static String versionId = "$Id: ChainedDispatcher.java 287 2005-02-22 00:29:02Z sskracic $"; public final static int DISPATCH_BREAK = 0; public final static int DISPATCH_CONTINUE = 1; diff --git a/ccm-core/src/com/arsdigita/dispatcher/DirectoryListingException.java b/ccm-core/src/com/arsdigita/dispatcher/DirectoryListingException.java index 7a17ae451..441c64d2f 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/DirectoryListingException.java +++ b/ccm-core/src/com/arsdigita/dispatcher/DirectoryListingException.java @@ -23,12 +23,11 @@ package com.arsdigita.dispatcher; * code that lists the contents of a directory may want to be triggered. * * @author Bill Schneider - * @version $Revision: #9 $ $Date: 2004/08/16 $ - * @since 4.5 */ + * @version $Id: DirectoryListingException.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DirectoryListingException extends Exception { - public static final String versionId = "$Id: DirectoryListingException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public DirectoryListingException() { super(); } diff --git a/ccm-core/src/com/arsdigita/dispatcher/Dispatcher.java b/ccm-core/src/com/arsdigita/dispatcher/Dispatcher.java index 799b4f82f..ad50e36c2 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/Dispatcher.java +++ b/ccm-core/src/com/arsdigita/dispatcher/Dispatcher.java @@ -43,12 +43,11 @@ import javax.servlet.http.HttpServletResponse; * then it is also an entry point for the entire web application. * * @author Bill Schneider - * @version ACS 4.5 - * @since 4.5 */ + * @version $Id: Dispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface Dispatcher { - public static final String versionId = "$Id: Dispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Dispatches this request. diff --git a/ccm-core/src/com/arsdigita/dispatcher/DispatcherChain.java b/ccm-core/src/com/arsdigita/dispatcher/DispatcherChain.java index 0e8c2d910..9ce4cf1d5 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/DispatcherChain.java +++ b/ccm-core/src/com/arsdigita/dispatcher/DispatcherChain.java @@ -42,9 +42,10 @@ import javax.servlet.http.HttpServletResponse; * *

The dispatcher chain tries each dispatcher in the dispatcher * chain successively in the order in which they were added to the chain. + * + * @version $Id: DispatcherChain.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DispatcherChain implements Dispatcher { - public final static String versionId = "$Id: DispatcherChain.java 287 2005-02-22 00:29:02Z sskracic $"; private LinkedList m_dispatcherChain = new LinkedList(); diff --git a/ccm-core/src/com/arsdigita/dispatcher/DispatcherConstants.java b/ccm-core/src/com/arsdigita/dispatcher/DispatcherConstants.java index b800f33b4..f693d9488 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/DispatcherConstants.java +++ b/ccm-core/src/com/arsdigita/dispatcher/DispatcherConstants.java @@ -19,7 +19,6 @@ package com.arsdigita.dispatcher; interface DispatcherConstants { - public static final String versionId = "$Id: DispatcherConstants.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Attribute name for the Throwable object saved when a JSP diff --git a/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java b/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java index c5983f008..238d03c78 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java +++ b/ccm-core/src/com/arsdigita/dispatcher/DispatcherHelper.java @@ -20,11 +20,13 @@ package com.arsdigita.dispatcher; import com.arsdigita.util.Assert; +import com.arsdigita.util.ParameterProvider; import com.arsdigita.util.StringUtils; import com.arsdigita.util.URLRewriter; import com.arsdigita.web.ParameterMap; import com.arsdigita.web.RedirectSignal; import com.arsdigita.web.URL; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -33,6 +35,7 @@ import java.util.Calendar; import java.util.Date; import java.util.Set; import java.util.TimeZone; + import javax.mail.MessagingException; import javax.servlet.RequestDispatcher; import javax.servlet.ServletContext; @@ -41,6 +44,7 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.PageContext; + import org.apache.log4j.Logger; /** diff --git a/ccm-core/src/com/arsdigita/dispatcher/InitialRequestContext.java b/ccm-core/src/com/arsdigita/dispatcher/InitialRequestContext.java index 8c7e1c5a6..e5cce9ec8 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/InitialRequestContext.java +++ b/ccm-core/src/com/arsdigita/dispatcher/InitialRequestContext.java @@ -30,14 +30,10 @@ import org.apache.log4j.Logger; * the first application context for an incoming request. * * @author Bill Schneider - * @version ACS 4.5 + * @version $Id: InitialRequestContext.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 */ public class InitialRequestContext implements RequestContext { - public static final String versionId = - "$Id: InitialRequestContext.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (InitialRequestContext.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/InitializerServlet.java b/ccm-core/src/com/arsdigita/dispatcher/InitializerServlet.java index d3e65dfc2..288c92280 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/InitializerServlet.java +++ b/ccm-core/src/com/arsdigita/dispatcher/InitializerServlet.java @@ -31,12 +31,11 @@ import javax.servlet.http.HttpServlet; * calling the initializers in the enterprise.init file. * * @author Raphael Schloming (rhs@mit.edu) - * @version $Revision: #15 $ $Date: 2004/08/16 $ */ + * @version $Id: InitializerServlet.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class InitializerServlet extends HttpServlet { - public final static String versionId = "$Id: InitializerServlet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Script m_ini = null; private static boolean loaded = false; diff --git a/ccm-core/src/com/arsdigita/dispatcher/JSPApplicationDispatcher.java b/ccm-core/src/com/arsdigita/dispatcher/JSPApplicationDispatcher.java index 0b80ef851..94c8dfdd9 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/JSPApplicationDispatcher.java +++ b/ccm-core/src/com/arsdigita/dispatcher/JSPApplicationDispatcher.java @@ -59,14 +59,10 @@ import org.apache.log4j.Logger; * * * @author Bill Schneider - * @version $Version$, $Date: 2004/08/16 $ + * @version $Id: JSPApplicationDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ public class JSPApplicationDispatcher extends BaseDispatcherServlet implements Dispatcher { - public static final String versionId = - "$Id: JSPApplicationDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (JSPApplicationDispatcher.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/MapDispatcher.java b/ccm-core/src/com/arsdigita/dispatcher/MapDispatcher.java index 5b28b2082..569e27205 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/MapDispatcher.java +++ b/ccm-core/src/com/arsdigita/dispatcher/MapDispatcher.java @@ -84,11 +84,11 @@ import org.xml.sax.helpers.DefaultHandler; * /map/ serve file /packages/map-app/www/index.jsp * * - * @author Bill Schneider */ + * @author Bill Schneider + * @version $Id: MapDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class MapDispatcher implements Dispatcher { - public static final String versionId = "$Id: MapDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Map m_map = new HashMap(); // accesses to m_map must be synchronized diff --git a/ccm-core/src/com/arsdigita/dispatcher/MultipartHttpServletRequest.java b/ccm-core/src/com/arsdigita/dispatcher/MultipartHttpServletRequest.java index 9e89dd148..7636479c2 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/MultipartHttpServletRequest.java +++ b/ccm-core/src/com/arsdigita/dispatcher/MultipartHttpServletRequest.java @@ -57,14 +57,10 @@ import com.arsdigita.util.UncheckedWrapperException; * @author Karl Goldstein * @author Michael Pih * @author Uday Mathur - * @version $Revision: #19 $ $Date: 2004/08/16 $ + * @version $Id: MultipartHttpServletRequest.java 1512 2007-03-22 02:36:06Z apevec $ * @since 4.5 */ public class MultipartHttpServletRequest implements HttpServletRequest { - public static final String versionId = - "$Id: MultipartHttpServletRequest.java 1512 2007-03-22 02:36:06Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Category s_log = Category.getInstance (MultipartHttpServletRequest.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/ObjectNotFoundException.java b/ccm-core/src/com/arsdigita/dispatcher/ObjectNotFoundException.java index 2a74a9b15..7c0e94a97 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/ObjectNotFoundException.java +++ b/ccm-core/src/com/arsdigita/dispatcher/ObjectNotFoundException.java @@ -28,10 +28,6 @@ package com.arsdigita.dispatcher; * @version $Id: ObjectNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ObjectNotFoundException extends RuntimeException { - public final static String versionId = - "$Id: ObjectNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; // The default error detail message. private final static String ERROR_MSG = "The object requested cannot be found"; diff --git a/ccm-core/src/com/arsdigita/dispatcher/OrionDefaultServlet.java b/ccm-core/src/com/arsdigita/dispatcher/OrionDefaultServlet.java index 942705f08..73c8e1951 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/OrionDefaultServlet.java +++ b/ccm-core/src/com/arsdigita/dispatcher/OrionDefaultServlet.java @@ -26,11 +26,13 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; +/** + * + * @version $Id: OrionDefaultServlet.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class OrionDefaultServlet extends HttpServlet implements DispatcherConstants { - public static final String versionId = "$Id: OrionDefaultServlet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $ $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(OrionDefaultServlet.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java b/ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java.nolongerInUse similarity index 86% rename from ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java rename to ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java.nolongerInUse index 448a7cd37..b51d78307 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java +++ b/ccm-core/src/com/arsdigita/dispatcher/ParameterProvider.java.nolongerInUse @@ -23,5 +23,4 @@ package com.arsdigita.dispatcher; */ public interface ParameterProvider extends com.arsdigita.util.ParameterProvider { - public static final String versionId = "$Id: ParameterProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; } diff --git a/ccm-core/src/com/arsdigita/dispatcher/RedirectException.java b/ccm-core/src/com/arsdigita/dispatcher/RedirectException.java index 3bfda03d4..f8fd73e0c 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RedirectException.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RedirectException.java @@ -24,11 +24,10 @@ package com.arsdigita.dispatcher; * slash. * * @author Bill Schneider - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: RedirectException.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 */ public class RedirectException extends Exception { - public static final String versionId = "$Id: RedirectException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public RedirectException(String s) { super(s); } diff --git a/ccm-core/src/com/arsdigita/dispatcher/RedirectorServlet.java b/ccm-core/src/com/arsdigita/dispatcher/RedirectorServlet.java index 05228dcc4..b66a264d9 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RedirectorServlet.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RedirectorServlet.java @@ -29,12 +29,12 @@ import org.apache.log4j.Logger; /** * A servlet that redirects. It takes parameter a servlet parameter "target" * that is used for the destination of the redirect. - **/ + * + * @version $Id: RedirectorServlet.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class RedirectorServlet extends HttpServlet { - public final static String versionId = "$Id: RedirectorServlet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger( RedirectorServlet.class); diff --git a/ccm-core/src/com/arsdigita/dispatcher/RequestContext.java b/ccm-core/src/com/arsdigita/dispatcher/RequestContext.java index 2097efc6f..c22f07aa9 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RequestContext.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RequestContext.java @@ -33,13 +33,11 @@ import javax.servlet.ServletContext; * of the URL. * * @author Bill Schneider - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: RequestContext.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 */ public interface RequestContext { - public static final String versionId = - "$Id: RequestContext.java 287 2005-02-22 00:29:02Z sskracic $"; /** * Gets the portion of the URL that has not been used by diff --git a/ccm-core/src/com/arsdigita/dispatcher/RequestEvent.java b/ccm-core/src/com/arsdigita/dispatcher/RequestEvent.java index ed22771bd..c89b35071 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RequestEvent.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RequestEvent.java @@ -27,11 +27,10 @@ import javax.servlet.http.HttpServletResponse; * * @see RequestListener * @author Bill Schneider - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: RequestEvent.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 */ public class RequestEvent { - public static final String versionId = "$Id: RequestEvent.java 287 2005-02-22 00:29:02Z sskracic $"; private HttpServletRequest m_req; private HttpServletResponse m_resp; diff --git a/ccm-core/src/com/arsdigita/dispatcher/RequestListener.java b/ccm-core/src/com/arsdigita/dispatcher/RequestListener.java index 663d4ba77..501ee3c1d 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RequestListener.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RequestListener.java @@ -25,12 +25,10 @@ import java.util.EventListener; * when a request starts or ends. * * @author Bill Schneider - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: RequestListener.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 */ public interface RequestListener extends EventListener { - public static final String versionId = "$Id: RequestListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Called when ACSServlet starts processing an incoming request. * @param e the event diff --git a/ccm-core/src/com/arsdigita/dispatcher/RequestValue.java b/ccm-core/src/com/arsdigita/dispatcher/RequestValue.java index dffdb9c7c..ec3709fa5 100755 --- a/ccm-core/src/com/arsdigita/dispatcher/RequestValue.java +++ b/ccm-core/src/com/arsdigita/dispatcher/RequestValue.java @@ -62,8 +62,6 @@ import java.util.HashMap; **/ public class RequestValue { - public static final String versionId = "$Id: RequestValue.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final String ATTRIBUTE_KEY = "com.arsdigita.dispatcher.RequestValue"; diff --git a/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java b/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java index 2c1fe529f..9fdb5fcd1 100755 --- a/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java +++ b/ccm-core/src/com/arsdigita/domain/AbstractDomainObjectObserver.java @@ -29,10 +29,6 @@ import com.arsdigita.persistence.DataObject; */ public abstract class AbstractDomainObjectObserver implements DomainObjectObserver { - public static final String versionId = - "$Id: AbstractDomainObjectObserver.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; /** * Callback for a set operation on the observed DomainObject diff --git a/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java b/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java index 515973a3a..89ee315a6 100755 --- a/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java +++ b/ccm-core/src/com/arsdigita/domain/DataObjectNotFoundException.java @@ -23,12 +23,9 @@ package com.arsdigita.domain; * cannot be found. * * @author Oumi Mehrota + * @version $Id: DataObjectNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DataObjectNotFoundException extends RuntimeException { - public static final String versionId = - "$Id: DataObjectNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; public DataObjectNotFoundException(final String message) { super(message); diff --git a/ccm-core/src/com/arsdigita/domain/DomainCollection.java b/ccm-core/src/com/arsdigita/domain/DomainCollection.java index cada049b8..2408f92aa 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainCollection.java +++ b/ccm-core/src/com/arsdigita/domain/DomainCollection.java @@ -26,15 +26,13 @@ import com.arsdigita.persistence.DataCollection; * would extend. It provides navigation methods that delegate to a * contained DataCollection. * - * @author Phong Nguyen - * @version 1.0 - * * @see com.arsdigita.persistence.DataCollection - **/ + * + * @author Phong Nguyen + * @version $Id: DomainCollection.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class DomainCollection extends DomainQuery { - public static final String versionId = "$Id: DomainCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - protected final DataCollection m_dataCollection; /** diff --git a/ccm-core/src/com/arsdigita/domain/DomainException.java b/ccm-core/src/com/arsdigita/domain/DomainException.java index ac31d32c3..e047abb6d 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainException.java +++ b/ccm-core/src/com/arsdigita/domain/DomainException.java @@ -21,13 +21,11 @@ package com.arsdigita.domain; /** * DomainException * - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: DomainException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DomainException extends Exception { - public final static String versionId = "$Id: DomainException.java 287 2005-02-22 00:29:02Z sskracic $"; - public DomainException(String message) { super(message); } diff --git a/ccm-core/src/com/arsdigita/domain/DomainObject.java b/ccm-core/src/com/arsdigita/domain/DomainObject.java index 60b46300b..5ab538618 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainObject.java +++ b/ccm-core/src/com/arsdigita/domain/DomainObject.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; * * @version 1.0 * @version $Id: DomainObject.java 738 2005-09-01 12:36:52Z sskracic $ - **/ + */ public abstract class DomainObject { /** The logging object for this class. */ @@ -62,7 +62,7 @@ public abstract class DomainObject { * * @param typeName The name of the ObjectType of the * new instance. - **/ + */ public DomainObject(String typeName) { Session s = SessionManager.getSession(); @@ -87,7 +87,7 @@ public abstract class DomainObject { * @see com.arsdigita.persistence.metadata.ObjectType * * @param type The ObjectType of the new instance. - **/ + */ public DomainObject(ObjectType type) { Session s = SessionManager.getSession(); if (s == null) { @@ -115,7 +115,7 @@ public abstract class DomainObject { * * @exception DataObjectNotFoundException Thrown if we cannot * retrieve a data object for the specified OID - **/ + */ public DomainObject(OID oid) throws DataObjectNotFoundException { Session s = SessionManager.getSession(); if (s == null) { diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java b/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java index d3875b9c2..96f17676d 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java +++ b/ccm-core/src/com/arsdigita/domain/DomainObjectObserver.java @@ -28,12 +28,10 @@ import com.arsdigita.persistence.DataObject; * multiple domain objects that wrap the same data object. * * @author Joseph Bank - * @version 1.0 - **/ + * @version $Id: DomainObjectObserver.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface DomainObjectObserver { - public static final String versionId = "$Id: DomainObjectObserver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Callback for a set operation on the observed DomainObject * diff --git a/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java b/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java index 8fb2a29e0..4633704aa 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java +++ b/ccm-core/src/com/arsdigita/domain/DomainObjectXMLRenderer.java @@ -41,7 +41,7 @@ import org.apache.log4j.Logger; * can be controlled using the various setWrapXXX methods detailed * below. * - * @version $Id: DomainObjectXMLRenderer.java 1534 2007-03-23 12:08:00Z chrisgilbert23 $ + * @version $Id: DomainObjectXMLRenderer.java 2071 2010-01-28 18:24:06Z pboy $ */ public class DomainObjectXMLRenderer extends DomainObjectTraversal { diff --git a/ccm-core/src/com/arsdigita/domain/DomainQuery.java b/ccm-core/src/com/arsdigita/domain/DomainQuery.java index 213600f2e..288d65953 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainQuery.java +++ b/ccm-core/src/com/arsdigita/domain/DomainQuery.java @@ -30,16 +30,14 @@ import java.util.Map; * This is the base class that all other domain query classes * would extend. It provides a facade on to a contained DataQuery. * + * @see com.arsdigita.persistence.DataQuery + * * @author Oumi Mehrotra * @author Matthew Booth - * @version 1.0 - * - * @see com.arsdigita.persistence.DataQuery - **/ + * @version $Id: DomainQuery.java 1045 2005-12-09 13:41:22Z sskracic $ + */ public abstract class DomainQuery implements DataQuery { - public static final String versionId = "$Id: DomainQuery.java 1045 2005-12-09 13:41:22Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - protected final DataQuery m_dataQuery; /** diff --git a/ccm-core/src/com/arsdigita/domain/DomainService.java b/ccm-core/src/com/arsdigita/domain/DomainService.java index e76f1fff6..27dbb0b6a 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainService.java +++ b/ccm-core/src/com/arsdigita/domain/DomainService.java @@ -27,13 +27,12 @@ import com.arsdigita.persistence.DataCollection; * need privileged access to the DataObject encapsulated by a * DomainObject or the DataCollection encapsulated by a DomainCollection. * - * @author Oumi Mehrotra - * @version 1.0 - * * @see com.arsdigita.persistence.DataObject - **/ + * + * @author Oumi Mehrotra + * @version $Id: DomainService.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class DomainService { - public static final String versionId = "$Id: DomainService.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * diff --git a/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java b/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java index 9a1df0ec7..bb7392680 100755 --- a/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java +++ b/ccm-core/src/com/arsdigita/domain/DomainServiceInterfaceExposer.java @@ -31,7 +31,6 @@ import com.arsdigita.persistence.DataObject; public class DomainServiceInterfaceExposer extends DomainService { - public static final String versionId = "$Id: DomainServiceInterfaceExposer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * * Get a property of the specified domain object. diff --git a/ccm-core/src/com/arsdigita/domain/GlobalObserver.java b/ccm-core/src/com/arsdigita/domain/GlobalObserver.java index f6499a063..2a5c1abd9 100755 --- a/ccm-core/src/com/arsdigita/domain/GlobalObserver.java +++ b/ccm-core/src/com/arsdigita/domain/GlobalObserver.java @@ -28,14 +28,11 @@ package com.arsdigita.domain; * robust. * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ - **/ + * @version $Id: GlobalObserver.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface GlobalObserver extends DomainObjectObserver { - public final static String versionId = "$Id: GlobalObserver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - /** * This method should return a value indicating whether or not this * GlobalObserver wishes to observe the given domain object. diff --git a/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java b/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java index ffdf8cb2c..be3659720 100755 --- a/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java +++ b/ccm-core/src/com/arsdigita/domain/InstantiatorNotFoundException.java @@ -25,13 +25,11 @@ import com.arsdigita.persistence.PersistenceException; * it is unable to find an instantiator for a given DataObject. * * @author Stanislav Freidin - * @version $Revision: #8 $ + * @version $Id: InstantiatorNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class InstantiatorNotFoundException extends PersistenceException { - public final static String versionId = "$Id: InstantiatorNotFoundException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Constructor for an InstantiatorNotFoundException which does not wrap * another exception. diff --git a/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java b/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java index 094cb2760..d95739f96 100755 --- a/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java +++ b/ccm-core/src/com/arsdigita/domain/ObservableDomainObject.java @@ -40,10 +40,6 @@ import java.util.ArrayList; **/ public abstract class ObservableDomainObject extends DomainObject { - public static final String versionId = - "$Id: ObservableDomainObject.java 287 2005-02-22 00:29:02Z sskracic $" + - "by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final org.apache.log4j.Logger s_log = org.apache.log4j.Logger.getLogger(ObservableDomainObject.class); diff --git a/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java b/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java index c3323a58b..4d3203808 100755 --- a/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java +++ b/ccm-core/src/com/arsdigita/domain/ReflectionInstantiator.java @@ -32,10 +32,11 @@ import org.apache.log4j.Logger; * This instantiator is primarily intended for other instantiators * (such as ACSObjectInstantiator) to provide the default behavior * of instiating a domain class using reflection. - **/ + * + * @version $Id: ReflectionInstantiator.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ReflectionInstantiator extends DomainObjectInstantiator { - public static final String versionId = "$Id: ReflectionInstantiator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(ReflectionInstantiator.class); private Constructor m_constructor; diff --git a/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java b/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java index 447aa256a..8e4377c79 100755 --- a/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java +++ b/ccm-core/src/com/arsdigita/domain/xml/TraversalHandler.java @@ -41,13 +41,11 @@ import java.util.HashMap; * TraversalHandler * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: TraversalHandler.java 1534 2007-03-23 12:08:00Z chrisgilbert23 $ **/ public class TraversalHandler extends DefaultHandler { - public final static String versionId = "$Id: TraversalHandler.java 1534 2007-03-23 12:08:00Z chrisgilbert23 $ by $Author: chrisgilbert23 $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(TraversalHandler.class); diff --git a/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaData.java b/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaData.java index b2595ce35..f9f11599e 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaData.java +++ b/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaData.java @@ -33,7 +33,6 @@ import com.arsdigita.formbuilder.util.FormBuilderUtil; */ public class AttributeMetaData { - public static final String versionId = "$Id: AttributeMetaData.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private String m_parameterName; private String m_label; diff --git a/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaDataList.java b/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaDataList.java index f2f9a8082..fd900f062 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaDataList.java +++ b/ccm-core/src/com/arsdigita/formbuilder/AttributeMetaDataList.java @@ -31,7 +31,6 @@ package com.arsdigita.formbuilder; */ public class AttributeMetaDataList { - public static final String versionId = "$Id: AttributeMetaDataList.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private java.util.ArrayList m_attributeList; private int m_iteratorIndex = 0; diff --git a/ccm-core/src/com/arsdigita/formbuilder/AttributeType.java b/ccm-core/src/com/arsdigita/formbuilder/AttributeType.java index 783c9e14f..9cb199de2 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/AttributeType.java +++ b/ccm-core/src/com/arsdigita/formbuilder/AttributeType.java @@ -36,8 +36,6 @@ import java.util.List; */ public class AttributeType { - public static final String versionId = "$Id: AttributeType.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Class m_parameterModelClass; private List m_validationListeners; diff --git a/ccm-core/src/com/arsdigita/formbuilder/FormSectionGenerator.java b/ccm-core/src/com/arsdigita/formbuilder/FormSectionGenerator.java index 34ceee21c..7b77b1916 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/FormSectionGenerator.java +++ b/ccm-core/src/com/arsdigita/formbuilder/FormSectionGenerator.java @@ -67,7 +67,6 @@ import org.apache.log4j.Logger; */ public class FormSectionGenerator { - public static final String versionId = "$Id: FormSectionGenerator.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(FormSectionGenerator.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/Initializer.java b/ccm-core/src/com/arsdigita/formbuilder/Initializer.java index 26ec82894..c61dec854 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/Initializer.java +++ b/ccm-core/src/com/arsdigita/formbuilder/Initializer.java @@ -40,8 +40,8 @@ import org.apache.log4j.Logger; * that is mounted under formbuilder (this is done only once). * * @author Peter Marklund - * @version $Revision: #10 $ $Date: 2004/08/16 $ */ - + * @version $Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class Initializer implements com.arsdigita.initializer.Initializer { @@ -51,8 +51,6 @@ public class Initializer private static final Logger log = Logger.getLogger(Initializer.class); - public final static String versionId = "$Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $"; - public Initializer() throws InitializationException { } diff --git a/ccm-core/src/com/arsdigita/formbuilder/MetaObjectCollection.java b/ccm-core/src/com/arsdigita/formbuilder/MetaObjectCollection.java index 4c430e7de..3646016f9 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/MetaObjectCollection.java +++ b/ccm-core/src/com/arsdigita/formbuilder/MetaObjectCollection.java @@ -25,8 +25,11 @@ import com.arsdigita.persistence.DataObject; import com.arsdigita.util.Assert; import java.math.BigDecimal; +/** + * + * @version $Id: MetaObjectCollection.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class MetaObjectCollection extends DomainCollection { - public static final String versionId = "$Id: MetaObjectCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; protected MetaObjectCollection(DataCollection dataCollection) { super(dataCollection); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java index fa18387f9..e22da79b6 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java @@ -46,7 +46,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; */ public class PersistentCheckboxGroup extends PersistentOptionGroup { - public static final String versionId = "$Id: PersistentCheckboxGroup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentComponent.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentComponent.java index 4ba91ac3e..5e1abe24a 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentComponent.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentComponent.java @@ -61,8 +61,6 @@ import org.apache.log4j.Logger; */ public abstract class PersistentComponent extends AuditedACSObject { - public static final String versionId = "$Id: PersistentComponent.java 317 2005-03-11 19:04:37Z mbooth $ by $Author: mbooth $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentComponent.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentContainer.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentContainer.java index 5fbe26b6a..aeaff25a2 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentContainer.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentContainer.java @@ -33,8 +33,6 @@ import java.util.Iterator; */ public interface PersistentContainer { - public static final String versionId = "$Id: PersistentContainer.java 317 2005-03-11 19:04:37Z mbooth $ by $Author: mbooth $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Add a component last in the list of components in * this container. diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentDate.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentDate.java index 89a066b0f..3dca60c7c 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentDate.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentDate.java @@ -56,8 +56,6 @@ import org.apache.log4j.Logger; */ public class PersistentDate extends PersistentWidget { - public static final String versionId = "$Id: PersistentDate.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentDate.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentDeditor.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentDeditor.java index 35389f7f2..b12f8dbc5 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentDeditor.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentDeditor.java @@ -54,8 +54,6 @@ import org.apache.log4j.Logger; */ public class PersistentDeditor extends PersistentWidget { - public static final String versionId = "$Id: PersistentDeditor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentDeditor.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentEmailField.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentEmailField.java index 65576eb97..0df95fae6 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentEmailField.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentEmailField.java @@ -34,15 +34,13 @@ import org.apache.log4j.Logger; * is saved with the save() method. To resurrect the TextField, use the constructor * taking the id of the saved TextField and then invoke createComponent(). * - * @author Shubham nagar - * @company Infoaxon Technology - * @date 13-12-2004 - * + * @author Shubham nagar + * @company Infoaxon Technology + * @date 13-12-2004 + * @version $Id: PersistentEmailField.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PersistentEmailField extends PersistentWidget { - public static final String versionId = "$Id: PersistentEmailField.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentEmailField.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentForm.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentForm.java index 156a6e6a5..2eb86ce49 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentForm.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentForm.java @@ -54,8 +54,6 @@ import org.apache.log4j.Logger; */ public class PersistentForm extends PersistentFormSection { - public static final String versionId = "$Id: PersistentForm.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentForm.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentFormSection.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentFormSection.java index a12cd49ad..2afe398cd 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentFormSection.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentFormSection.java @@ -47,8 +47,6 @@ import org.apache.log4j.Logger; public class PersistentFormSection extends PersistentComponent implements PersistentContainer, CompoundComponent { - public static final String versionId = "$Id: PersistentFormSection.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentFormSection.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentHeading.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentHeading.java index f7cd9893a..07b3a7ba6 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentHeading.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentHeading.java @@ -52,8 +52,6 @@ import org.apache.log4j.Logger; */ public class PersistentHeading extends PersistentText { - public static final String versionId = "$Id: PersistentHeading.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentHeading.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentLabel.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentLabel.java index 4ed071dd1..fe422a32c 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentLabel.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentLabel.java @@ -51,8 +51,6 @@ import org.apache.log4j.Logger; */ public class PersistentLabel extends PersistentComponent { - public static final String versionId = "$Id: PersistentLabel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentLabel.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java index e1314b2fd..7c320c9be 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java @@ -46,8 +46,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; */ public class PersistentMultipleSelect extends PersistentSelect { - public static final String versionId = "$Id: PersistentMultipleSelect.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * BASE_DATA_OBJECT_TYPE represents the full name of the diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentOption.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentOption.java index f9ef9f3fa..9b319494c 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentOption.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentOption.java @@ -45,8 +45,6 @@ import com.arsdigita.bebop.form.Option; */ public class PersistentOption extends PersistentComponent { - public static final String versionId = "$Id: PersistentOption.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * The fully qualified name of the underlying DataObject of this class. */ diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentOptionGroup.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentOptionGroup.java index 3b31a2436..50e314497 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentOptionGroup.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentOptionGroup.java @@ -45,8 +45,6 @@ import org.apache.log4j.Logger; */ public abstract class PersistentOptionGroup extends PersistentWidget { - public static final String versionId = "$Id: PersistentOptionGroup.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentOptionGroup.class); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java index f8c2f09d6..3086022ba 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentRadioGroup.java @@ -46,8 +46,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; */ public class PersistentRadioGroup extends PersistentOptionGroup { - public static final String versionId = "$Id: PersistentRadioGroup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * BASE_DATA_OBJECT_TYPE represents the full name of the diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentSelect.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentSelect.java index d215419ff..4b1a368c7 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentSelect.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentSelect.java @@ -45,8 +45,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; */ public abstract class PersistentSelect extends PersistentOptionGroup { - public static final String versionId = "$Id: PersistentSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * BASE_DATA_OBJECT_TYPE represents the full name of the diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentSingleSelect.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentSingleSelect.java index 23a62a976..54961e929 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentSingleSelect.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentSingleSelect.java @@ -50,9 +50,6 @@ import com.arsdigita.domain.DataObjectNotFoundException; */ public class PersistentSingleSelect extends PersistentSelect { - public static final String versionId = "$Id: PersistentSingleSelect.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - /** * BASE_DATA_OBJECT_TYPE represents the full name of the * underlying DataObject of this class. diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentSubmit.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentSubmit.java index 8a2421d79..5c0704029 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentSubmit.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentSubmit.java @@ -51,8 +51,6 @@ import org.apache.log4j.Logger; */ public class PersistentSubmit extends PersistentWidget { - public static final String versionId = "$Id: PersistentSubmit.java 317 2005-03-11 19:04:37Z mbooth $ by $Author: mbooth $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentSubmit.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentText.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentText.java index 525271542..08d5fea46 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentText.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentText.java @@ -53,8 +53,6 @@ import org.apache.log4j.Logger; */ public class PersistentText extends PersistentComponent { - public static final String versionId = "$Id: PersistentText.java 317 2005-03-11 19:04:37Z mbooth $ by $Author: mbooth $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentText.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentTextArea.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentTextArea.java index 207a16b70..07d608fc9 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentTextArea.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentTextArea.java @@ -54,8 +54,6 @@ import org.apache.log4j.Logger; */ public class PersistentTextArea extends PersistentWidget { - public static final String versionId = "$Id: PersistentTextArea.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentTextArea.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentTextField.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentTextField.java index 30ca3c4d7..09961800f 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentTextField.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentTextField.java @@ -51,8 +51,6 @@ import org.apache.log4j.Logger; */ public class PersistentTextField extends PersistentWidget { - public static final String versionId = "$Id: PersistentTextField.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentTextField.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/PersistentWidget.java b/ccm-core/src/com/arsdigita/formbuilder/PersistentWidget.java index b1da75fdc..907a497f8 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/PersistentWidget.java +++ b/ccm-core/src/com/arsdigita/formbuilder/PersistentWidget.java @@ -52,8 +52,6 @@ import com.arsdigita.util.UncheckedWrapperException; */ public abstract class PersistentWidget extends PersistentComponent { - public static final String versionId = "$Id: PersistentWidget.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentWidget.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/TestAttributeListener.java b/ccm-core/src/com/arsdigita/formbuilder/TestAttributeListener.java index c64e8d414..5d61cc61d 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/TestAttributeListener.java +++ b/ccm-core/src/com/arsdigita/formbuilder/TestAttributeListener.java @@ -35,8 +35,6 @@ import com.arsdigita.bebop.parameters.EmailParameter; */ public class TestAttributeListener extends TestProcessListener { - public static final String versionId = "$Id: TestAttributeListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public AttributeMetaDataList getAttributeMetaData() { AttributeMetaDataList attributeList = new AttributeMetaDataList(); diff --git a/ccm-core/src/com/arsdigita/formbuilder/TestProcessListener.java b/ccm-core/src/com/arsdigita/formbuilder/TestProcessListener.java index 4cb86bf66..805f20417 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/TestProcessListener.java +++ b/ccm-core/src/com/arsdigita/formbuilder/TestProcessListener.java @@ -37,8 +37,6 @@ import org.apache.log4j.Logger; */ public class TestProcessListener implements FormProcessListener { - public static final String versionId = "$Id: TestProcessListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // Logging private static final Logger s_log = Logger.getLogger(TestProcessListener.class); diff --git a/ccm-core/src/com/arsdigita/formbuilder/installer/Initializer.java b/ccm-core/src/com/arsdigita/formbuilder/installer/Initializer.java index 6fc69b9f2..aa823c88b 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/installer/Initializer.java +++ b/ccm-core/src/com/arsdigita/formbuilder/installer/Initializer.java @@ -124,14 +124,14 @@ public class Initializer extends BaseInitializer { } public BebopObjectType getObjectType(String name, - Class type) { + Class type) { BebopObjectType objectType = null; try { objectType = BebopObjectType.findByClass(name, - type); + type); } catch (DataObjectNotFoundException ex) { objectType = BebopObjectType.create(name, - type); + type); objectType.save(); } return objectType; diff --git a/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentParameterListener.java b/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentParameterListener.java index 775ae0ae6..fcdb12925 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentParameterListener.java +++ b/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentParameterListener.java @@ -55,8 +55,6 @@ import com.arsdigita.util.Assert; */ public class PersistentParameterListener extends ACSObject { - public static final String versionId = "$Id: PersistentParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentParameterListener.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentStringInRangeValidationListener.java b/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentStringInRangeValidationListener.java index bfcd2a1da..3c49ded3c 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentStringInRangeValidationListener.java +++ b/ccm-core/src/com/arsdigita/formbuilder/parameters/PersistentStringInRangeValidationListener.java @@ -47,8 +47,6 @@ import org.apache.log4j.Logger; public abstract class PersistentStringInRangeValidationListener extends PersistentParameterListener { - public static final String versionId = "$Id: PersistentStringInRangeValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentStringInRangeValidationListener.class.getName()); diff --git a/ccm-core/src/com/arsdigita/formbuilder/ui/ClassValidationListener.java b/ccm-core/src/com/arsdigita/formbuilder/ui/ClassValidationListener.java index 299bf72f5..85056275e 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/ui/ClassValidationListener.java +++ b/ccm-core/src/com/arsdigita/formbuilder/ui/ClassValidationListener.java @@ -41,8 +41,6 @@ import com.arsdigita.bebop.event.ParameterEvent; public class ClassValidationListener implements ParameterListener { - public static final String versionId = "$Id: ClassValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Class m_assignableClass = null; /** diff --git a/ccm-core/src/com/arsdigita/formbuilder/ui/FormIDHidden.java b/ccm-core/src/com/arsdigita/formbuilder/ui/FormIDHidden.java index 4fc53bd1d..81ddb6e18 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/ui/FormIDHidden.java +++ b/ccm-core/src/com/arsdigita/formbuilder/ui/FormIDHidden.java @@ -34,8 +34,6 @@ import com.arsdigita.bebop.event.PrintEvent; */ public class FormIDHidden extends Hidden { - public static final String versionId = "$Id: FormIDHidden.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public FormIDHidden() { super("form_id"); diff --git a/ccm-core/src/com/arsdigita/formbuilder/util/AttributeHelper.java b/ccm-core/src/com/arsdigita/formbuilder/util/AttributeHelper.java index c87d069a1..1e99f4f26 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/util/AttributeHelper.java +++ b/ccm-core/src/com/arsdigita/formbuilder/util/AttributeHelper.java @@ -40,6 +40,7 @@ import java.util.Map; import com.arsdigita.util.Assert; import com.arsdigita.util.StringUtils; import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.xml.Element; import org.apache.oro.text.perl.Perl5Util; @@ -55,8 +56,6 @@ import org.apache.oro.text.perl.Perl5Util; */ public class AttributeHelper { - public static final String versionId = "$Id: AttributeHelper.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // Used during SAX parsing by the DefaultHandler to set the // attributes that it finds. private com.arsdigita.bebop.util.Attributes m_attributesObject; @@ -99,8 +98,8 @@ public class AttributeHelper { // This is a contrived way of retrieving the attributes but the upside // is that I am not modifying the Bebop code in any way - ExtendedElement componentElement = - new ExtendedElement("ignore", "ignore"); + Element componentElement = + new Element("ignore", "ignore"); // Export the attributes to the element attributes.exportAttributes(componentElement); diff --git a/ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java b/ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java.nolongerInUse similarity index 87% rename from ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java rename to ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java.nolongerInUse index a442d0636..67de96893 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java +++ b/ccm-core/src/com/arsdigita/formbuilder/util/ExtendedElement.java.nolongerInUse @@ -25,7 +25,6 @@ package com.arsdigita.formbuilder.util; */ public class ExtendedElement extends com.arsdigita.xml.Element { - public static final String versionId = "$Id: ExtendedElement.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ExtendedElement( String name, String uri ) { super(name, uri); diff --git a/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java b/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java index f143905f3..1b9096a3e 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java +++ b/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java @@ -26,14 +26,11 @@ import org.apache.log4j.Logger; /** - * @author Justin Ross * @see com.arsdigita.bebop.Bebop + * @author Justin Ross + * @version $Id: FormBuilderConfig.java 1498 2007-03-19 16:22:15Z apevec $ */ public final class FormBuilderConfig extends AbstractConfig { - public static final String versionId = - "$Id: FormBuilderConfig.java 1498 2007-03-19 16:22:15Z apevec $" + - "$Author: apevec $" + - "$DateTime: $"; private static final Logger s_log = Logger.getLogger(FormBuilderConfig.class); diff --git a/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java b/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java index 0bb37f738..63e7a9dd4 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java +++ b/ccm-core/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java @@ -55,8 +55,6 @@ import org.apache.log4j.Logger; */ public class FormBuilderUtil { - public static final String versionId = "$Id: FormBuilderUtil.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(FormBuilderUtil.class); diff --git a/ccm-core/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java b/ccm-core/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java index 310c642c3..460909a5d 100755 --- a/ccm-core/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java +++ b/ccm-core/src/com/arsdigita/formbuilder/util/PersistentContainerHelper.java @@ -49,8 +49,6 @@ import org.apache.log4j.Logger; public class PersistentContainerHelper implements PersistentContainer { - public static final String versionId = "$Id: PersistentContainerHelper.java 317 2005-03-11 19:04:37Z mbooth $ by $Author: mbooth $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PersistentContainerHelper.class); diff --git a/ccm-core/src/com/arsdigita/globalization/AcceptCharset.java b/ccm-core/src/com/arsdigita/globalization/AcceptCharset.java index 1d983e24f..1ee6b58db 100755 --- a/ccm-core/src/com/arsdigita/globalization/AcceptCharset.java +++ b/ccm-core/src/com/arsdigita/globalization/AcceptCharset.java @@ -26,10 +26,9 @@ import java.util.Locale; * header. *

* - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: AcceptCharset.java 287 2005-02-22 00:29:02Z sskracic $ */ public class AcceptCharset extends AcceptField { - public final static String versionId = "$Id: AcceptCharset.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private final static String DEFAULT_CHARSET = "ISO-8859-1"; diff --git a/ccm-core/src/com/arsdigita/globalization/Globalization.java b/ccm-core/src/com/arsdigita/globalization/Globalization.java index 5136dd15b..a3cba0511 100755 --- a/ccm-core/src/com/arsdigita/globalization/Globalization.java +++ b/ccm-core/src/com/arsdigita/globalization/Globalization.java @@ -43,13 +43,9 @@ import org.apache.log4j.Logger; * it. *

* - * @version $Revision: #15 $ $Date: 2004/08/16 $ + * @version $Id: Globalization.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Globalization { - public final static String versionId = - "$Id: Globalization.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Globalization.class); diff --git a/ccm-core/src/com/arsdigita/initializer/Configuration.java b/ccm-core/src/com/arsdigita/initializer/Configuration.java index 34b316e71..977ee4d5c 100755 --- a/ccm-core/src/com/arsdigita/initializer/Configuration.java +++ b/ccm-core/src/com/arsdigita/initializer/Configuration.java @@ -59,13 +59,11 @@ import java.util.Set; * * * @author rhs@mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: Configuration.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Configuration { - public final static String versionId = "$Id: Configuration.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - Map m_parameters = new HashMap(); Map m_types = new HashMap(); Map m_usage = new HashMap(); diff --git a/ccm-core/src/com/arsdigita/initializer/InitializationException.java b/ccm-core/src/com/arsdigita/initializer/InitializationException.java index ec12e02ec..2ae387794 100755 --- a/ccm-core/src/com/arsdigita/initializer/InitializationException.java +++ b/ccm-core/src/com/arsdigita/initializer/InitializationException.java @@ -24,13 +24,11 @@ import com.arsdigita.util.UncheckedWrapperException; * InitializationException * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: InitializationException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class InitializationException extends UncheckedWrapperException { - public final static String versionId = "$Id: InitializationException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public InitializationException(String message) { super(message); } diff --git a/ccm-core/src/com/arsdigita/initializer/Initializer.java b/ccm-core/src/com/arsdigita/initializer/Initializer.java index 3efcdcab5..2dd413b8f 100755 --- a/ccm-core/src/com/arsdigita/initializer/Initializer.java +++ b/ccm-core/src/com/arsdigita/initializer/Initializer.java @@ -69,30 +69,25 @@ package com.arsdigita.initializer; * * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Initializer { - public static final String versionId = "$Id: Initializer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns the configuration object used by this initializer. - **/ - + */ Configuration getConfiguration(); /** * Called on startup. - **/ - + */ void startup() throws InitializationException; /** * Called on shutdown. It's probably not a good idea to depend on this * being called. - **/ - + */ void shutdown()throws InitializationException; } diff --git a/ccm-core/src/com/arsdigita/initializer/Script.java b/ccm-core/src/com/arsdigita/initializer/Script.java index 52dd0add8..2400b25f0 100755 --- a/ccm-core/src/com/arsdigita/initializer/Script.java +++ b/ccm-core/src/com/arsdigita/initializer/Script.java @@ -36,16 +36,11 @@ import java.util.Set; * Script * * @author rhs@mit.edu - * @version $Revision: #22 $ $Date: 2004/08/16 $ + * @version $Id: Script.java 738 2005-09-01 12:36:52Z sskracic $ */ public class Script { - public final static String versionId = - "$Id: Script.java 738 2005-09-01 12:36:52Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Script.class); diff --git a/ccm-core/src/com/arsdigita/initializer/Startup.java b/ccm-core/src/com/arsdigita/initializer/Startup.java index c34489431..277c5cdcd 100755 --- a/ccm-core/src/com/arsdigita/initializer/Startup.java +++ b/ccm-core/src/com/arsdigita/initializer/Startup.java @@ -33,14 +33,12 @@ import java.util.Set; * * @author Michael Bryzek * @author Dennis Gregorovic - * @version $Revision: #12 $ $Date: 2004/08/16 $ + * @version $Id: Startup.java 738 2005-09-01 12:36:52Z sskracic $ * @since ACS 4.7 * **/ public class Startup { - public static final String versionId = "$Id: Startup.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** The name of the property containing the web app root **/ public static final String WEB_APP_ROOT = "webAppRoot"; diff --git a/ccm-core/src/com/arsdigita/initializer/package.html b/ccm-core/src/com/arsdigita/initializer/package.html index 3e175b5e0..74a5c02e2 100755 --- a/ccm-core/src/com/arsdigita/initializer/package.html +++ b/ccm-core/src/com/arsdigita/initializer/package.html @@ -9,7 +9,8 @@ Provides a simple framework for initializing components at system startup time. - +

+

Old Initialization System - deprecated!

diff --git a/ccm-core/src/com/arsdigita/kernel/ResourceCollection.java b/ccm-core/src/com/arsdigita/kernel/ResourceCollection.java index 355637132..f8b53dc2d 100755 --- a/ccm-core/src/com/arsdigita/kernel/ResourceCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/ResourceCollection.java @@ -30,13 +30,11 @@ import org.apache.log4j.Logger; * @see com.arsdigita.kernel.Resource * @see com.arsdigita.kernel.ResourceType * @see com.arsdigita.kernel.ResourceTypeCollection + * * @author Jim Parsons <jparsons@redhat.com> + * @version $Id: ResourceCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ResourceCollection extends ACSObjectCollection { - public static final String versionId = - "$Id: ResourceCollection.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ResourceCollection.class); diff --git a/ccm-core/src/com/arsdigita/kernel/UserCollection.java b/ccm-core/src/com/arsdigita/kernel/UserCollection.java index ce13b4480..94b7e7c77 100755 --- a/ccm-core/src/com/arsdigita/kernel/UserCollection.java +++ b/ccm-core/src/com/arsdigita/kernel/UserCollection.java @@ -26,12 +26,10 @@ import com.arsdigita.persistence.DataCollection; * Represents a collection of parties. * * @author Phong Nguyen - * @version 1.0 + * @version $Id: UserCollection.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class UserCollection extends PartyCollection { - public static final String versionId = "$Id: UserCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Constructor. * diff --git a/ccm-core/src/com/arsdigita/kernel/permissions/PermissionDescriptor.java b/ccm-core/src/com/arsdigita/kernel/permissions/PermissionDescriptor.java index f7abaedbf..6250a1226 100755 --- a/ccm-core/src/com/arsdigita/kernel/permissions/PermissionDescriptor.java +++ b/ccm-core/src/com/arsdigita/kernel/permissions/PermissionDescriptor.java @@ -31,16 +31,14 @@ import com.arsdigita.util.UncheckedWrapperException; * A PermissionDescriptor is used with the PermissionService to check, * grant, and revoke permissions. * - * @author Oumi Mehrotra - * @version 1.0 - * * @see com.arsdigita.kernel.permissions.PrivilegeDescriptor * @see com.arsdigita.kernel.permissions.PermissionService + * + * @author Oumi Mehrotra + * @version $Id: PermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class PermissionDescriptor { - public static final String versionId = "$Id: PermissionDescriptor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private OID m_partyOID; private OID m_acsObjectOID; private PrivilegeDescriptor m_privilege; // not null diff --git a/ccm-core/src/com/arsdigita/kernel/ui/DataQueryTreeModel.java b/ccm-core/src/com/arsdigita/kernel/ui/DataQueryTreeModel.java index 65e7cfb10..b84388f6e 100755 --- a/ccm-core/src/com/arsdigita/kernel/ui/DataQueryTreeModel.java +++ b/ccm-core/src/com/arsdigita/kernel/ui/DataQueryTreeModel.java @@ -99,8 +99,6 @@ import org.apache.log4j.Logger; */ public class DataQueryTreeModel implements TreeModel { - public static final String versionId = "$Id: DataQueryTreeModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(DataQueryTreeModel.class); diff --git a/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java b/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java index 7f62722ee..a15fddc98 100755 --- a/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java +++ b/ccm-core/src/com/arsdigita/loader/MimeTypeRow.java @@ -31,7 +31,7 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @version $Revision: #5 $ $Date: 2004/08/16 $ - * @version $Id: MimeTypeRow.java 287 2005-02-22 00:29:02Z sskracic $ + * @version $Id: MimeTypeRow.java 2070 2010-01-28 08:47:41Z pboy $ */ class MimeTypeRow extends AbstractConfig { diff --git a/ccm-core/src/com/arsdigita/loader/PackageLoader.java b/ccm-core/src/com/arsdigita/loader/PackageLoader.java index 936ce1305..ba36d9498 100755 --- a/ccm-core/src/com/arsdigita/loader/PackageLoader.java +++ b/ccm-core/src/com/arsdigita/loader/PackageLoader.java @@ -48,7 +48,7 @@ import com.arsdigita.util.parameter.ParameterReader; * PackageLoader * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Id: PackageLoader.java 1840 2009-03-05 07:51:20Z terry $ + * @version $Id: PackageLoader.java 2070 2010-01-28 08:47:41Z pboy $ */ public abstract class PackageLoader extends AbstractScript { diff --git a/ccm-core/src/com/arsdigita/logging/ErrorReport.java b/ccm-core/src/com/arsdigita/logging/ErrorReport.java index f1cb5c12f..4e38e5cf1 100755 --- a/ccm-core/src/com/arsdigita/logging/ErrorReport.java +++ b/ccm-core/src/com/arsdigita/logging/ErrorReport.java @@ -54,12 +54,9 @@ import org.apache.log4j.Logger; * @author Dan Berrange * @see * http://www.tuxedo.org/~esr/jargon/html/entry/guru-meditation.html + * @version $Id: ErrorReport.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ErrorReport { - public static final String versionId = - "$Id: ErrorReport.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; // We generate ACS Error Reports in homage of Guru Meditation. diff --git a/ccm-core/src/com/arsdigita/logging/Log.java b/ccm-core/src/com/arsdigita/logging/Log.java index eeb7898bc..0ae752110 100755 --- a/ccm-core/src/com/arsdigita/logging/Log.java +++ b/ccm-core/src/com/arsdigita/logging/Log.java @@ -25,10 +25,9 @@ package com.arsdigita.logging; *

* * @author Yon Feldman - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Log.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Log { - public final static String versionId = "$Id: Log.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // this variable will hold the secure state for this class on a per thread // basis. diff --git a/ccm-core/src/com/arsdigita/logging/SecureLogFilter.java b/ccm-core/src/com/arsdigita/logging/SecureLogFilter.java index c62680004..09b2b1ec0 100755 --- a/ccm-core/src/com/arsdigita/logging/SecureLogFilter.java +++ b/ccm-core/src/com/arsdigita/logging/SecureLogFilter.java @@ -28,11 +28,9 @@ import org.apache.log4j.spi.LoggingEvent; *

* * @author Yon Feldman - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: SecureLogFilter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SecureLogFilter extends Filter { - - public static final String versionId = "$Id: SecureLogFilter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Decides whether to let this log message go through. * diff --git a/ccm-core/src/com/arsdigita/logging/examples/LogExample.java b/ccm-core/src/com/arsdigita/logging/examples/LogExample.java index ee9c7ced9..42aa63972 100755 --- a/ccm-core/src/com/arsdigita/logging/examples/LogExample.java +++ b/ccm-core/src/com/arsdigita/logging/examples/LogExample.java @@ -30,12 +30,9 @@ import org.apache.log4j.RollingFileAppender; * This is an example class that uses the secure logging api. *

* - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: LogExample.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LogExample { - public final static String versionId = - "$Id: LogExample.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // get the logger named the same as this class static final Logger cat = Logger.getLogger(LogExample.class); diff --git a/ccm-core/src/com/arsdigita/logging/examples/LogExampleThread.java b/ccm-core/src/com/arsdigita/logging/examples/LogExampleThread.java index 337d1173b..500900556 100755 --- a/ccm-core/src/com/arsdigita/logging/examples/LogExampleThread.java +++ b/ccm-core/src/com/arsdigita/logging/examples/LogExampleThread.java @@ -26,12 +26,9 @@ import org.apache.log4j.Logger; * This is a helper class to the example class LogExampleThread *

* - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: LogExampleThread.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LogExampleThread extends Thread { - public final static String - versionId = "$Id: LogExampleThread.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // get the category named the same as this class private static final Logger cat = Logger.getLogger(LogExampleThread.class); diff --git a/ccm-core/src/com/arsdigita/messaging/MessagingException.java b/ccm-core/src/com/arsdigita/messaging/MessagingException.java index b0f443fb6..9b28ebade 100755 --- a/ccm-core/src/com/arsdigita/messaging/MessagingException.java +++ b/ccm-core/src/com/arsdigita/messaging/MessagingException.java @@ -27,8 +27,6 @@ package com.arsdigita.messaging; public class MessagingException extends RuntimeException { - public static final String versionId = "$Id: MessagingException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Creates a new exception with a given error message. * @param message the error message diff --git a/ccm-core/src/com/arsdigita/messaging/SortKey.java b/ccm-core/src/com/arsdigita/messaging/SortKey.java index dece246c6..c2fd22c77 100755 --- a/ccm-core/src/com/arsdigita/messaging/SortKey.java +++ b/ccm-core/src/com/arsdigita/messaging/SortKey.java @@ -71,8 +71,6 @@ import org.apache.oro.text.perl.Perl5Util; public class SortKey { - public static final String versionId = "$Id: SortKey.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * A character array for storing the key. */ diff --git a/ccm-core/src/com/arsdigita/metadata/DynamicElement.java b/ccm-core/src/com/arsdigita/metadata/DynamicElement.java index d1ad986d7..b9799d9f8 100755 --- a/ccm-core/src/com/arsdigita/metadata/DynamicElement.java +++ b/ccm-core/src/com/arsdigita/metadata/DynamicElement.java @@ -30,13 +30,11 @@ import com.redhat.persistence.metadata.UniqueKey; * DynamicElement * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: DynamicElement.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class DynamicElement { - public final static String versionId = "$Id: DynamicElement.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This takes an ObjectType name and model, and generates a unique * table name that can be used to store the object type. diff --git a/ccm-core/src/com/arsdigita/persistence/AbstractTransactionListener.java b/ccm-core/src/com/arsdigita/persistence/AbstractTransactionListener.java index ab84d2a42..956bbfb4f 100755 --- a/ccm-core/src/com/arsdigita/persistence/AbstractTransactionListener.java +++ b/ccm-core/src/com/arsdigita/persistence/AbstractTransactionListener.java @@ -27,13 +27,11 @@ package com.arsdigita.persistence; * @see TransactionContext * @see TransactionListener * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: AbstractTransactionListener.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class AbstractTransactionListener implements TransactionListener { - public final static String versionId = "$Id: AbstractTransactionListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Called immediately before the transaction has committed */ diff --git a/ccm-core/src/com/arsdigita/persistence/C.java b/ccm-core/src/com/arsdigita/persistence/C.java index f709e66cb..588d971cc 100755 --- a/ccm-core/src/com/arsdigita/persistence/C.java +++ b/ccm-core/src/com/arsdigita/persistence/C.java @@ -30,13 +30,11 @@ import java.util.Map; * C * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: C.java 287 2005-02-22 00:29:02Z sskracic $ **/ final class C { - public final static String versionId = "$Id: C.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final com.redhat.persistence.metadata.ObjectType type (Root root, String qname) { return root.getObjectType(qname); diff --git a/ccm-core/src/com/arsdigita/persistence/CompoundFilter.java b/ccm-core/src/com/arsdigita/persistence/CompoundFilter.java index b5788435f..b63dcd73f 100755 --- a/ccm-core/src/com/arsdigita/persistence/CompoundFilter.java +++ b/ccm-core/src/com/arsdigita/persistence/CompoundFilter.java @@ -23,14 +23,11 @@ package com.arsdigita.persistence; * CompoundFilters are used to AND or OR multiple filters together. * * @author randyg@alum.mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: CompoundFilter.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface CompoundFilter extends Filter { - String versionId = "$Id: CompoundFilter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - /** * This provides a mechanism for adding conditions to the existing * filter. This appends the passed in conditions to the existing diff --git a/ccm-core/src/com/arsdigita/persistence/CompoundFilterImpl.java b/ccm-core/src/com/arsdigita/persistence/CompoundFilterImpl.java index 89ee9b99d..50119bf74 100755 --- a/ccm-core/src/com/arsdigita/persistence/CompoundFilterImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/CompoundFilterImpl.java @@ -32,13 +32,11 @@ import org.apache.log4j.Logger; * CompoundFilters are used to AND or OR multiple filters together. * * @author randyg@alum.mit.edu - * @version $Revision: #15 $ $Date: 2004/08/16 $ + * @version $Id: CompoundFilterImpl.java 738 2005-09-01 12:36:52Z sskracic $ */ class CompoundFilterImpl extends FilterImpl implements CompoundFilter { - public final static String versionId = "$Id: CompoundFilterImpl.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger m_log = Logger.getLogger(CompoundFilterImpl.class); diff --git a/ccm-core/src/com/arsdigita/persistence/ConnectionSource.java b/ccm-core/src/com/arsdigita/persistence/ConnectionSource.java index 5c079f48f..1a38b10fb 100755 --- a/ccm-core/src/com/arsdigita/persistence/ConnectionSource.java +++ b/ccm-core/src/com/arsdigita/persistence/ConnectionSource.java @@ -24,13 +24,11 @@ import java.sql.Connection; * ConnectionSource * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: ConnectionSource.java 813 2005-09-15 08:50:20Z sskracic $ **/ public interface ConnectionSource { - public final static String versionId = "$Id: ConnectionSource.java 813 2005-09-15 08:50:20Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - Connection acquire(); Connection acquire(Connection preferred); diff --git a/ccm-core/src/com/arsdigita/persistence/DataAssociation.java b/ccm-core/src/com/arsdigita/persistence/DataAssociation.java index 28349325c..0cd127d32 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataAssociation.java +++ b/ccm-core/src/com/arsdigita/persistence/DataAssociation.java @@ -32,14 +32,13 @@ import com.arsdigita.persistence.metadata.ObjectType; * * @author rhs@mit.edu * @author randyg@alum.mit.edu - * @version $Revision: #12 $ $Date: 2004/08/16 $ */ + * @version $Id: DataAssociation.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface DataAssociation extends DataCollection { // when this no longer extends DataCollection, make sure it // still has get/set Query and get/set Source - String versionId = "$Id: DataAssociation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Adds object to the persistent association. * Note: The object does NOT truly become part of the association until diff --git a/ccm-core/src/com/arsdigita/persistence/DataAssociationCursor.java b/ccm-core/src/com/arsdigita/persistence/DataAssociationCursor.java index a0c39c2cf..dc89d0b4d 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataAssociationCursor.java +++ b/ccm-core/src/com/arsdigita/persistence/DataAssociationCursor.java @@ -53,13 +53,11 @@ package com.arsdigita.persistence; * * @author rhs@mit.edu * @author randyg@alum.mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: DataAssociationCursor.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface DataAssociationCursor extends DataCollection { - public static final String versionId = "$Id: DataAssociationCursor.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns a data association that created this iterator **/ diff --git a/ccm-core/src/com/arsdigita/persistence/DataAssociationCursorImpl.java b/ccm-core/src/com/arsdigita/persistence/DataAssociationCursorImpl.java index 20b2501f1..d3a5abaa1 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataAssociationCursorImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataAssociationCursorImpl.java @@ -27,14 +27,12 @@ import com.redhat.persistence.metadata.ObjectType; * DataAssociationCursorImpl * * @author Archit Shah <ashah@mit.edu> - * @version $Revision: #18 $ $Date: 2004/08/16 $ + * @version $Id: DataAssociationCursorImpl.java 738 2005-09-01 12:36:52Z sskracic $ **/ class DataAssociationCursorImpl extends DataCollectionImpl implements DataAssociationCursor { - public final static String versionId = "$Id: DataAssociationCursorImpl.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private DataAssociationImpl m_assn; DataAssociationCursorImpl(Session ssn, DataObject data, Property prop) { diff --git a/ccm-core/src/com/arsdigita/persistence/DataAssociationImpl.java b/ccm-core/src/com/arsdigita/persistence/DataAssociationImpl.java index 655296042..092c50f96 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataAssociationImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataAssociationImpl.java @@ -25,14 +25,12 @@ import com.redhat.persistence.ProtoException; * DataAssociationImpl * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #21 $ $Date: 2004/08/16 $ + * @version $Id: DataAssociationImpl.java 287 2005-02-22 00:29:02Z sskracic $ **/ class DataAssociationImpl extends DataAssociationCursorImpl implements DataAssociation { - public final static String versionId = "$Id: DataAssociationImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private com.redhat.persistence.Session m_pssn; private DataObject m_data; private Property m_prop; diff --git a/ccm-core/src/com/arsdigita/persistence/DataCollection.java b/ccm-core/src/com/arsdigita/persistence/DataCollection.java index b939c1f82..cd389c6b6 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataCollection.java +++ b/ccm-core/src/com/arsdigita/persistence/DataCollection.java @@ -57,19 +57,17 @@ import com.arsdigita.persistence.metadata.ObjectType; * } * * - * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ - * * @see com.arsdigita.persistence.SessionManager * @see com.arsdigita.persistence.Session * @see com.arsdigita.persistence.DataObject * @see com.arsdigita.persistence.DataQuery + * + * @author rhs@mit.edu + * @version $Id: DataCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface DataCollection extends DataQuery { - String versionId = "$Id: DataCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns a data object for the current position in the collection. * diff --git a/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java b/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java index 817f2672c..02da49b03 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataCollectionImpl.java @@ -27,12 +27,10 @@ import org.apache.log4j.Logger; * DataCollectionImpl * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #13 $ $Date: 2004/08/16 $ + * @version $Id: DataCollectionImpl.java 287 2005-02-22 00:29:02Z sskracic $ **/ class DataCollectionImpl extends DataQueryImpl implements DataCollection { - public final static String versionId = "$Id: DataCollectionImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - DataCollectionImpl(Session ssn, DataSet ds) { super(ssn, ds); } @@ -68,4 +66,5 @@ class DataCollectionImpl extends DataQueryImpl implements DataCollection { public boolean contains(DataObject data) { throw new Error("not implemented"); } + } diff --git a/ccm-core/src/com/arsdigita/persistence/DataEvent.java b/ccm-core/src/com/arsdigita/persistence/DataEvent.java index ea6e25b13..1a309de2b 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataEvent.java +++ b/ccm-core/src/com/arsdigita/persistence/DataEvent.java @@ -22,13 +22,11 @@ package com.arsdigita.persistence; * DataEvent * * @author rhs@mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: DataEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class DataEvent { - public final static String versionId = "$Id: DataEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - DataObjectImpl m_object; public DataEvent(DataObjectImpl object) { diff --git a/ccm-core/src/com/arsdigita/persistence/DataHandler.java b/ccm-core/src/com/arsdigita/persistence/DataHandler.java index b135c63aa..732d300cb 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataHandler.java +++ b/ccm-core/src/com/arsdigita/persistence/DataHandler.java @@ -25,14 +25,10 @@ package com.arsdigita.persistence; * and turn them into soft deletes under certain circumstances. * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: DataHandler.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class DataHandler { - public final static String versionId = "$Id: DataHandler.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - /** * This method is called in order to delete a data object. By default this * executes the SQL defined in the object type definition for the given diff --git a/ccm-core/src/com/arsdigita/persistence/DataObject.java b/ccm-core/src/com/arsdigita/persistence/DataObject.java index dbe18b67e..47a84a85f 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataObject.java +++ b/ccm-core/src/com/arsdigita/persistence/DataObject.java @@ -24,19 +24,16 @@ import com.arsdigita.persistence.metadata.ObjectType; * Defines the public methods of Data Objects. * * @author rhs@mit.edu - * @version $Revision: #13 $ $Date: 2004/08/16 $ + * @version $Id: DataObject.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface DataObject { - String versionId = "$Id: DataObject.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns the type of this persistent object. * * @return The type of this persistent object. **/ - ObjectType getObjectType(); /** @@ -44,7 +41,6 @@ public interface DataObject { * * @return The id of this object. **/ - OID getOID(); /** @@ -54,7 +50,6 @@ public interface DataObject { * * @return The property value. **/ - Object get(String propertyName); /** @@ -63,7 +58,6 @@ public interface DataObject { * @param propertyName The property name. * @param value The desired value. **/ - void set(String propertyName, Object value); /** @@ -72,7 +66,6 @@ public interface DataObject { * * @return This object's Session. **/ - Session getSession(); /** @@ -80,7 +73,6 @@ public interface DataObject { * * @return True if the object is newly created. **/ - boolean isNew(); /** @@ -89,7 +81,6 @@ public interface DataObject { * * @return True if the object has been deleted **/ - boolean isDeleted(); /** @@ -99,7 +90,6 @@ public interface DataObject { * * @return True if the object exists in a committed state in the database. **/ - boolean isCommitted(); /** @@ -110,7 +100,6 @@ public interface DataObject { * * @return True if the object has been disconnected **/ - boolean isDisconnected(); /** @@ -119,7 +108,6 @@ public interface DataObject { * * @see #isDisconnected() **/ - void disconnect(); /** @@ -128,7 +116,6 @@ public interface DataObject { * * @return True if the object has been modified, false otherwise. **/ - boolean isModified(); /** @@ -137,7 +124,6 @@ public interface DataObject { * * @return True if the property has been modified, false otherwise. **/ - boolean isPropertyModified(String name); /** @@ -147,7 +133,6 @@ public interface DataObject { * * @return True if the object has been modified, false otherwise. **/ - boolean isValid(); /** @@ -155,7 +140,6 @@ public interface DataObject { * * @post isDeleted() **/ - void delete(); @@ -169,7 +153,6 @@ public interface DataObject { * * @post subtype.equals(getObjectType()) **/ - void specialize(ObjectType subtype); /** @@ -181,7 +164,6 @@ public interface DataObject { * * @pre SessionManager.getMetadataRoot().getObjectType(subtypeName) != null **/ - void specialize(String subtypeName); /** @@ -189,7 +171,6 @@ public interface DataObject { * * @post !(isNew() || isModified()) **/ - void save(); @@ -198,7 +179,6 @@ public interface DataObject { * * @param observer The observer to add to this DataObject. **/ - void addObserver(DataObserver observer); diff --git a/ccm-core/src/com/arsdigita/persistence/DataObjectImpl.java b/ccm-core/src/com/arsdigita/persistence/DataObjectImpl.java index 7e5d22cbe..398852049 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataObjectImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataObjectImpl.java @@ -38,13 +38,10 @@ import org.apache.log4j.Logger; * DataObjectImpl * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #24 $ $Date: 2004/08/16 $ + * @version $Id: DataObjectImpl.java 287 2005-02-22 00:29:02Z sskracic $ **/ - class DataObjectImpl implements DataObject { - public final static String versionId = "$Id: DataObjectImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - final static Logger s_log = Logger.getLogger(DataObjectImpl.class); private Session m_ssn; diff --git a/ccm-core/src/com/arsdigita/persistence/DataObserver.java b/ccm-core/src/com/arsdigita/persistence/DataObserver.java index ce15d9af3..07c4708ea 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataObserver.java +++ b/ccm-core/src/com/arsdigita/persistence/DataObserver.java @@ -22,13 +22,10 @@ package com.arsdigita.persistence; * DataObserver * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: DataObserver.java 287 2005-02-22 00:29:02Z sskracic $ **/ - public abstract class DataObserver { - public final static String versionId = "$Id: DataObserver.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public void set(DataObject object, String property, Object previous, Object value) {} diff --git a/ccm-core/src/com/arsdigita/persistence/DataOperation.java b/ccm-core/src/com/arsdigita/persistence/DataOperation.java index f6b9004e7..a019db3db 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataOperation.java +++ b/ccm-core/src/com/arsdigita/persistence/DataOperation.java @@ -36,8 +36,6 @@ import org.apache.log4j.Logger; */ public class DataOperation { - public static final String versionId = "$Id: DataOperation.java 562 2005-06-12 23:53:19Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_cat = Logger.getLogger(DataOperation.class); diff --git a/ccm-core/src/com/arsdigita/persistence/DataQuery.java b/ccm-core/src/com/arsdigita/persistence/DataQuery.java index efffb9f5f..c8662f5fe 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataQuery.java +++ b/ccm-core/src/com/arsdigita/persistence/DataQuery.java @@ -56,13 +56,11 @@ import java.util.Map; * * @author rhs@mit.edu * @author randyg@alum.mit.edu - * @version $Revision: #14 $ $Date: 2004/08/16 $ + * @version $Id: DataQuery.java 1045 2005-12-09 13:41:22Z sskracic $ */ public interface DataQuery { - String versionId = "$Id: DataQuery.java 1045 2005-12-09 13:41:22Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Returns the type of this data query. **/ diff --git a/ccm-core/src/com/arsdigita/persistence/DataQueryDecorator.java b/ccm-core/src/com/arsdigita/persistence/DataQueryDecorator.java index f1429bae0..2d44d597f 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataQueryDecorator.java +++ b/ccm-core/src/com/arsdigita/persistence/DataQueryDecorator.java @@ -30,8 +30,6 @@ import java.util.Map; */ public class DataQueryDecorator implements DataQuery { - String versionId = "$Id: DataQueryDecorator.java 1045 2005-12-09 13:41:22Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private DataQuery m_dq; /** diff --git a/ccm-core/src/com/arsdigita/persistence/DataQueryImpl.java b/ccm-core/src/com/arsdigita/persistence/DataQueryImpl.java index 9400892a4..72f34289d 100755 --- a/ccm-core/src/com/arsdigita/persistence/DataQueryImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/DataQueryImpl.java @@ -58,13 +58,10 @@ import org.apache.log4j.Logger; * DataQueryImpl * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #42 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: DataQueryImpl.java 1304 2006-08-31 13:12:47Z sskracic $ + */ class DataQueryImpl implements DataQuery { - public final static String versionId = "$Id: DataQueryImpl.java 1304 2006-08-31 13:12:47Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(DataQueryImpl.class); private static final String s_unalias = diff --git a/ccm-core/src/com/arsdigita/persistence/DedicatedConnectionSource.java b/ccm-core/src/com/arsdigita/persistence/DedicatedConnectionSource.java index 6b2b20893..4c6fe7937 100755 --- a/ccm-core/src/com/arsdigita/persistence/DedicatedConnectionSource.java +++ b/ccm-core/src/com/arsdigita/persistence/DedicatedConnectionSource.java @@ -25,13 +25,11 @@ import java.sql.Connection; * DedicatedConnectionSource * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: DedicatedConnectionSource.java 813 2005-09-15 08:50:20Z sskracic $ **/ public class DedicatedConnectionSource implements ConnectionSource { - public final static String versionId = "$Id: DedicatedConnectionSource.java 813 2005-09-15 08:50:20Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private String m_url; private ThreadLocal m_connections = new ThreadLocal() { public Object initialValue() { diff --git a/ccm-core/src/com/arsdigita/persistence/EqualsFilter.java b/ccm-core/src/com/arsdigita/persistence/EqualsFilter.java index d3e0402ad..ce412ea96 100755 --- a/ccm-core/src/com/arsdigita/persistence/EqualsFilter.java +++ b/ccm-core/src/com/arsdigita/persistence/EqualsFilter.java @@ -26,10 +26,12 @@ import com.redhat.persistence.oql.Literal; import com.redhat.persistence.oql.Not; import com.redhat.persistence.oql.Static; +/** + * + * @version $Id: EqualsFilter.java 287 2005-02-22 00:29:02Z sskracic $ + */ class EqualsFilter extends FilterImpl { - public final static String versionId = "$Id: EqualsFilter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final String m_attribute; private final String m_bindName; private final boolean m_not; diff --git a/ccm-core/src/com/arsdigita/persistence/Filter.java b/ccm-core/src/com/arsdigita/persistence/Filter.java index 4d0abdfe1..0ad591231 100755 --- a/ccm-core/src/com/arsdigita/persistence/Filter.java +++ b/ccm-core/src/com/arsdigita/persistence/Filter.java @@ -81,13 +81,11 @@ import java.util.Map; * * @author rhs@mit.edu * @author randyg@alum.mit.edu - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: Filter.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Filter { - String versionId = "$Id: Filter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // this string is used as the namespace for the bind variables String FILTER = "__FILTERPARAMS__"; diff --git a/ccm-core/src/com/arsdigita/persistence/FilterFactory.java b/ccm-core/src/com/arsdigita/persistence/FilterFactory.java index 31f37ef20..0bc90a88f 100755 --- a/ccm-core/src/com/arsdigita/persistence/FilterFactory.java +++ b/ccm-core/src/com/arsdigita/persistence/FilterFactory.java @@ -24,13 +24,11 @@ package com.arsdigita.persistence; * factories to hand out filters * * @author randyg@alum.mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: FilterFactory.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface FilterFactory { - String versionId = "$Id: FilterFactory.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // These are variables indicating what to use in the comparrison public final static int EQUALS = 1; public final static int NOT_EQUALS = 2; diff --git a/ccm-core/src/com/arsdigita/persistence/FilterFactoryImpl.java b/ccm-core/src/com/arsdigita/persistence/FilterFactoryImpl.java index abecbfcce..4a6699109 100755 --- a/ccm-core/src/com/arsdigita/persistence/FilterFactoryImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/FilterFactoryImpl.java @@ -22,13 +22,11 @@ package com.arsdigita.persistence; * FilterFactoryImpl actually hands out the requested filters * * @author randyg@alum.mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: FilterFactoryImpl.java 287 2005-02-22 00:29:02Z sskracic $ */ class FilterFactoryImpl implements FilterFactory { - public final static String versionId = "$Id: FilterFactoryImpl.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Session m_ssn; FilterFactoryImpl(Session ssn) { diff --git a/ccm-core/src/com/arsdigita/persistence/FilterImpl.java b/ccm-core/src/com/arsdigita/persistence/FilterImpl.java index fd5034ee4..43bc880dc 100755 --- a/ccm-core/src/com/arsdigita/persistence/FilterImpl.java +++ b/ccm-core/src/com/arsdigita/persistence/FilterImpl.java @@ -31,13 +31,10 @@ import org.apache.log4j.Logger; * be combined and manipulated to create complex queries. * * @author rhs@mit.edu - * @version $Revision: #19 $ $Date: 2004/08/16 $ + * @version $Id: FilterImpl.java 738 2005-09-01 12:36:52Z sskracic $ */ - abstract class FilterImpl implements Filter { - public final static String versionId = "$Id: FilterImpl.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger m_log = Logger.getLogger(Filter.class.getName()); diff --git a/ccm-core/src/com/arsdigita/persistence/FlushException.java b/ccm-core/src/com/arsdigita/persistence/FlushException.java index 6029b5bf7..af6a09064 100755 --- a/ccm-core/src/com/arsdigita/persistence/FlushException.java +++ b/ccm-core/src/com/arsdigita/persistence/FlushException.java @@ -21,11 +21,11 @@ package com.arsdigita.persistence; /** * An exception representing the inability to write all changes to the * database. It is caused by some required properties being set to null. + * + * @version $Id: FlushException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class FlushException extends PersistenceException { - public static final String versionId = "$Id: FlushException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * No public constructor. * Should only be constructed by PersistenceException.newInstance. diff --git a/ccm-core/src/com/arsdigita/persistence/GenericDataQuery.java b/ccm-core/src/com/arsdigita/persistence/GenericDataQuery.java index 10a408136..9be8b1dd0 100755 --- a/ccm-core/src/com/arsdigita/persistence/GenericDataQuery.java +++ b/ccm-core/src/com/arsdigita/persistence/GenericDataQuery.java @@ -35,13 +35,11 @@ import java.util.Collections; * GenericDataQuery * * @author rhs@mit.edu - * @version $Revision: #16 $ $Date: 2004/08/16 $ + * @version $Id: GenericDataQuery.java 738 2005-09-01 12:36:52Z sskracic $ */ public class GenericDataQuery extends DataQueryImpl { - public final static String versionId = "$Id: GenericDataQuery.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public GenericDataQuery(Session s, String sql, String[] columns) { super(s, ds(s, sql, columns)); } diff --git a/ccm-core/src/com/arsdigita/persistence/InFilter.java b/ccm-core/src/com/arsdigita/persistence/InFilter.java index 08c4df433..c8c798504 100755 --- a/ccm-core/src/com/arsdigita/persistence/InFilter.java +++ b/ccm-core/src/com/arsdigita/persistence/InFilter.java @@ -32,15 +32,13 @@ import org.apache.log4j.Logger; * InFilter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #13 $ $Date: 2004/08/16 $ + * @version $Id: InFilter.java 287 2005-02-22 00:29:02Z sskracic $ **/ class InFilter extends SimpleFilter implements Filter { private static Logger s_log = Logger.getLogger(InFilter.class); - public final static String versionId = "$Id: InFilter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - InFilter(Root root, String property, String subqueryProperty, String query) { super(makeConditions(root, property, subqueryProperty, query)); diff --git a/ccm-core/src/com/arsdigita/persistence/OID.java b/ccm-core/src/com/arsdigita/persistence/OID.java index 585d5e981..58eae2b20 100755 --- a/ccm-core/src/com/arsdigita/persistence/OID.java +++ b/ccm-core/src/com/arsdigita/persistence/OID.java @@ -53,15 +53,14 @@ import org.apache.log4j.Logger; * * * @author rhs@mit.edu - * @version $Revision: #16 $ $Date: 2004/08/16 $ */ - + * @version $Id: OID.java 1591 2007-06-15 12:52:55Z steve_p $ + */ public class OID { - public final static String versionId = "$Id: OID.java 1591 2007-06-15 12:52:55Z steve_p $ by $Author: steve_p $, $DateTime: 2004/08/16 18:10:38 $"; private ObjectType m_type; private Map m_values = new HashMap(); - /** some shorthand names for common content-types */ + /** some shorthand names for common content-types */ private final static String[][] TYPE_SHORTHAND = { {"Article", "com.arsdigita.cms.contenttypes.Article"}, {"MultiPartArticle", "com.arsdigita.cms.contenttypes.MultiPartArticle"}, @@ -78,17 +77,12 @@ public class OID { /** the separator character to be used in the new OID formatting scheme */ private final static char OID_SEPARATOR_CHAR = '-'; - /** - * A Format used for formatting/parsing OIDs - */ + /** A Format used for formatting/parsing OIDs */ private static MessageFormat m_format_old = new MessageFormat("[{0}:{1}]"); private static MessageFormat m_format_new = new MessageFormat("{0}" + OID_SEPARATOR_CHAR + "{1}"); - /** - * used to log errors - */ - private static final Logger m_log = - Logger.getLogger(OID.class); + /** used to log errors */ + private static final Logger m_log = Logger.getLogger(OID.class); /** @@ -113,7 +107,8 @@ public class OID { * * @param type The ObjectType * - * @pre type != null */ + * @pre type != null + */ public OID(ObjectType type) { m_type = type; } @@ -286,7 +281,8 @@ public class OID { * != 1). * * @pre type != null - * @pre type.getObjectMap().getObjectKey().getCount() == 1 */ + * @pre type.getObjectMap().getObjectKey().getCount() == 1 + */ public OID(ObjectType type, int value) { this(type, new BigDecimal(value)); } diff --git a/ccm-core/src/com/arsdigita/persistence/ObjectDeletedException.java b/ccm-core/src/com/arsdigita/persistence/ObjectDeletedException.java index a673e7a73..7d23310dd 100755 --- a/ccm-core/src/com/arsdigita/persistence/ObjectDeletedException.java +++ b/ccm-core/src/com/arsdigita/persistence/ObjectDeletedException.java @@ -22,13 +22,11 @@ package com.arsdigita.persistence; * ObjectDeletedException * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: ObjectDeletedException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ObjectDeletedException extends PersistenceException { - public final static String versionId = "$Id: ObjectDeletedException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public ObjectDeletedException(String message) { super(message); } diff --git a/ccm-core/src/com/arsdigita/persistence/OracleSQLUtilities.java b/ccm-core/src/com/arsdigita/persistence/OracleSQLUtilities.java index b21f92a02..1349787a9 100755 --- a/ccm-core/src/com/arsdigita/persistence/OracleSQLUtilities.java +++ b/ccm-core/src/com/arsdigita/persistence/OracleSQLUtilities.java @@ -25,13 +25,10 @@ package com.arsdigita.persistence; * value of null with "is null" or "is not null" * * @author randyg@alum.mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: OracleSQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ */ - class OracleSQLUtilities implements SQLUtilities { - String versionId = "$Id: OracleSQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This method takes a comparator (e.g. =, <=, >=, !=, <>) * as well as a variable name and then creates the appropriate diff --git a/ccm-core/src/com/arsdigita/persistence/PersistenceException.java b/ccm-core/src/com/arsdigita/persistence/PersistenceException.java index 01968c245..da0b1d207 100755 --- a/ccm-core/src/com/arsdigita/persistence/PersistenceException.java +++ b/ccm-core/src/com/arsdigita/persistence/PersistenceException.java @@ -25,13 +25,11 @@ import com.arsdigita.util.UncheckedWrapperException; * * @author rhs@mit.edu * @author randyg@alum.mit.edu - * @version $Revision: #14 $ $Date: 2004/08/16 $ + * @version $Id: PersistenceException.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PersistenceException extends UncheckedWrapperException { - public final static String versionId = "$Id: PersistenceException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Constructor for a PersistenceException which does not wrap * another exception. If wrapping another exception, diff --git a/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java b/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java index 3a725248d..e4fbe63ac 100755 --- a/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java +++ b/ccm-core/src/com/arsdigita/persistence/PooledConnectionSource.java @@ -39,13 +39,11 @@ import org.apache.log4j.Logger; * PooledConnectionSource * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: PooledConnectionSource.java 885 2005-09-20 15:54:06Z sskracic $ **/ public class PooledConnectionSource implements ConnectionSource { - public final static String versionId = "$Id: PooledConnectionSource.java 885 2005-09-20 15:54:06Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PooledConnectionSource.class); diff --git a/ccm-core/src/com/arsdigita/persistence/PostgresSQLUtilities.java b/ccm-core/src/com/arsdigita/persistence/PostgresSQLUtilities.java index 855ea6573..8581b422b 100755 --- a/ccm-core/src/com/arsdigita/persistence/PostgresSQLUtilities.java +++ b/ccm-core/src/com/arsdigita/persistence/PostgresSQLUtilities.java @@ -23,13 +23,10 @@ package com.arsdigita.persistence; * This manipulates SQL in a way that is specific to Postgres. * * @author randyg@alum.mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: PostgresSQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ */ - class PostgresSQLUtilities implements SQLUtilities { - String versionId = "$Id: PostgresSQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This method takes a comparator (e.g. =, <=, >=, !=, <>) * as well as a variable name and then creates the appropriate diff --git a/ccm-core/src/com/arsdigita/persistence/SQLUtilities.java b/ccm-core/src/com/arsdigita/persistence/SQLUtilities.java index d7179695a..d14fdb295 100755 --- a/ccm-core/src/com/arsdigita/persistence/SQLUtilities.java +++ b/ccm-core/src/com/arsdigita/persistence/SQLUtilities.java @@ -25,13 +25,11 @@ package com.arsdigita.persistence; * the Oracle instance of this replaces "= null" with "is null" * * @author randyg@alum.mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: SQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface SQLUtilities { - String versionId = "$Id: SQLUtilities.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * This method takes a comparator (e.g. =, <=, >=, !=, <>) * as well as a variable name and then creates the appropriate diff --git a/ccm-core/src/com/arsdigita/persistence/SessionManager.java b/ccm-core/src/com/arsdigita/persistence/SessionManager.java index b335825ba..394532a96 100755 --- a/ccm-core/src/com/arsdigita/persistence/SessionManager.java +++ b/ccm-core/src/com/arsdigita/persistence/SessionManager.java @@ -45,13 +45,11 @@ import org.apache.log4j.Logger; * * @see Initializer * @author Archit Shah - * @version $Revision: #18 $ $Date: 2004/08/16 $ + * @version $Id: SessionManager.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SessionManager { - public static final String versionId = "$Id: SessionManager.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger (SessionManager.class.getName()); diff --git a/ccm-core/src/com/arsdigita/persistence/SimpleFilter.java b/ccm-core/src/com/arsdigita/persistence/SimpleFilter.java index 9b948ae4c..c1b165a11 100755 --- a/ccm-core/src/com/arsdigita/persistence/SimpleFilter.java +++ b/ccm-core/src/com/arsdigita/persistence/SimpleFilter.java @@ -27,13 +27,11 @@ import com.redhat.persistence.oql.Static; * SimpleFilter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: SimpleFilter.java 287 2005-02-22 00:29:02Z sskracic $ **/ class SimpleFilter extends FilterImpl { - public final static String versionId = "$Id: SimpleFilter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - String m_conditions; SimpleFilter(String conditions) { diff --git a/ccm-core/src/com/arsdigita/persistence/TransactionContext.java b/ccm-core/src/com/arsdigita/persistence/TransactionContext.java index 9009ba4c9..1d8aa9b48 100755 --- a/ccm-core/src/com/arsdigita/persistence/TransactionContext.java +++ b/ccm-core/src/com/arsdigita/persistence/TransactionContext.java @@ -33,13 +33,10 @@ import org.apache.log4j.Logger; * Description: The TransactionContext class encapsulates a database transaction. * * @author rhs@mit.edu - * @version $Revision: #21 $ $Date: 2004/08/16 $ + * @version $Id: TransactionContext.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TransactionContext { - - String versionId = "$Id: TransactionContext.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_cat = Logger.getLogger(TransactionContext.class); diff --git a/ccm-core/src/com/arsdigita/persistence/UndefinedEventException.java b/ccm-core/src/com/arsdigita/persistence/UndefinedEventException.java index 42af749c3..65edc59ea 100755 --- a/ccm-core/src/com/arsdigita/persistence/UndefinedEventException.java +++ b/ccm-core/src/com/arsdigita/persistence/UndefinedEventException.java @@ -29,9 +29,6 @@ package com.arsdigita.persistence; public class UndefinedEventException extends PersistenceException { - - public final static String versionId = "$Id: UndefinedEventException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public UndefinedEventException(String msg) { super(msg, null); } diff --git a/ccm-core/src/com/arsdigita/persistence/Utilities.java b/ccm-core/src/com/arsdigita/persistence/Utilities.java index f905ebcbc..7b742929c 100755 --- a/ccm-core/src/com/arsdigita/persistence/Utilities.java +++ b/ccm-core/src/com/arsdigita/persistence/Utilities.java @@ -23,13 +23,11 @@ package com.arsdigita.persistence; * Utilities * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Utilities.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Utilities { - public final static String versionId = "$Id: Utilities.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public final static String LINE_BREAK = System.getProperty("line.separator", "\n\r"); diff --git a/ccm-core/src/com/arsdigita/persistence/metadata/ObjectType.java b/ccm-core/src/com/arsdigita/persistence/metadata/ObjectType.java index afd19a48d..d2805a951 100755 --- a/ccm-core/src/com/arsdigita/persistence/metadata/ObjectType.java +++ b/ccm-core/src/com/arsdigita/persistence/metadata/ObjectType.java @@ -33,8 +33,7 @@ import java.util.Iterator; * @author rhs@mit.edu * @version $Revision: #19 $ $Date: 2004/08/16 $ * @version $Id: ObjectType.java 287 2005-02-22 00:29:02Z sskracic $ - **/ - + */ public class ObjectType extends CompoundType { static ObjectType diff --git a/ccm-core/src/com/arsdigita/persistence/pdl/PDL.java b/ccm-core/src/com/arsdigita/persistence/pdl/PDL.java index 8c00a18b1..343d4f998 100755 --- a/ccm-core/src/com/arsdigita/persistence/pdl/PDL.java +++ b/ccm-core/src/com/arsdigita/persistence/pdl/PDL.java @@ -61,13 +61,11 @@ import org.apache.log4j.Logger; * a single XML file (the first command line argument). * * @author rhs@mit.edu - * @version $Revision: #33 $ $Date: 2004/08/16 $ + * @version $Id: PDL.java 738 2005-09-01 12:36:52Z sskracic $ */ public class PDL { - public final static String versionId = "$Id: PDL.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(PDL.class); private static boolean s_quiet = false; diff --git a/ccm-core/src/com/arsdigita/portal/Initializer.java b/ccm-core/src/com/arsdigita/portal/Initializer.java index db17b0f60..42dd5960e 100755 --- a/ccm-core/src/com/arsdigita/portal/Initializer.java +++ b/ccm-core/src/com/arsdigita/portal/Initializer.java @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; * @version $Id: Initializer.java 738 2005-09-01 12:36:52Z sskracic $ */ public class Initializer implements com.arsdigita.initializer.Initializer { - + private static Logger s_log = Logger.getLogger(Initializer.class); private Configuration m_conf = new Configuration(); diff --git a/ccm-core/src/com/arsdigita/portal/Portal.java b/ccm-core/src/com/arsdigita/portal/Portal.java index d31e9be3e..e0ef3b900 100755 --- a/ccm-core/src/com/arsdigita/portal/Portal.java +++ b/ccm-core/src/com/arsdigita/portal/Portal.java @@ -281,7 +281,7 @@ public class Portal extends Resource { * * @param portlet the portlet instance to add. * @param cellNumber the cell in which to place this portlet. cellNumber's - * value must be greater than or isEqual to 1. + * value must be greater than or equal to 1. * @pre portlet != null * @pre cellNumber >= 1 */ diff --git a/ccm-core/src/com/arsdigita/portal/Portlet.java b/ccm-core/src/com/arsdigita/portal/Portlet.java index d9da72ef4..1a331a26b 100755 --- a/ccm-core/src/com/arsdigita/portal/Portlet.java +++ b/ccm-core/src/com/arsdigita/portal/Portlet.java @@ -59,10 +59,6 @@ import org.apache.log4j.Logger; * @version $Id: Portlet.java 1549 2007-03-29 14:58:55Z chrisgilbert23 $ */ public class Portlet extends Resource { - public static final String versionId = - "$Id: Portlet.java 1549 2007-03-29 14:58:55Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.portal.Portlet"; diff --git a/ccm-core/src/com/arsdigita/portal/PortletCollection.java b/ccm-core/src/com/arsdigita/portal/PortletCollection.java index 8b7c854cc..80b023fce 100755 --- a/ccm-core/src/com/arsdigita/portal/PortletCollection.java +++ b/ccm-core/src/com/arsdigita/portal/PortletCollection.java @@ -35,10 +35,6 @@ import com.arsdigita.util.Assert; */ public class PortletCollection extends ApplicationCollection { - // public static final String versionId = - // "$Id: PortletCollection.java 287 2005-02-22 00:29:02Z sskracic $" + - // "by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public PortletCollection(DataCollection dataCollection) { super(dataCollection); } diff --git a/ccm-core/src/com/arsdigita/sitenode/BasePresentationManager.java b/ccm-core/src/com/arsdigita/sitenode/BasePresentationManager.java index 29d1c0945..c1438bd6c 100755 --- a/ccm-core/src/com/arsdigita/sitenode/BasePresentationManager.java +++ b/ccm-core/src/com/arsdigita/sitenode/BasePresentationManager.java @@ -78,10 +78,6 @@ import org.apache.log4j.Logger; * @version $Id: BasePresentationManager.java 562 2005-06-12 23:53:19Z apevec $ */ public class BasePresentationManager implements PresentationManager { - public static final String versionId = - "$Id: BasePresentationManager.java 562 2005-06-12 23:53:19Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (BasePresentationManager.class); diff --git a/ccm-core/src/com/arsdigita/sitenode/SiteNodeDispatcher.java b/ccm-core/src/com/arsdigita/sitenode/SiteNodeDispatcher.java index 2d9de25fe..e648c52af 100755 --- a/ccm-core/src/com/arsdigita/sitenode/SiteNodeDispatcher.java +++ b/ccm-core/src/com/arsdigita/sitenode/SiteNodeDispatcher.java @@ -79,7 +79,7 @@ import org.apache.log4j.Logger; *

* * @author Bill Schneider - * @version $Revision: #43 $ $Date: 2004/08/16 $ + * @version $Id: SiteNodeDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ * @since 4.5 * @deprecated Use {@link com.arsdigita.web.DispatcherServlet} instead. * Pboy (2009-08-06): @@ -93,10 +93,6 @@ import org.apache.log4j.Logger; */ public class SiteNodeDispatcher extends KernelDispatcherServlet implements Dispatcher { - public static final String versionId = - "$Id: SiteNodeDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(SiteNodeDispatcher.class.getName()); diff --git a/ccm-core/src/com/arsdigita/sitenode/SiteNodeRequestContext.java b/ccm-core/src/com/arsdigita/sitenode/SiteNodeRequestContext.java index 53459c8b3..a99b6685d 100755 --- a/ccm-core/src/com/arsdigita/sitenode/SiteNodeRequestContext.java +++ b/ccm-core/src/com/arsdigita/sitenode/SiteNodeRequestContext.java @@ -37,18 +37,14 @@ import org.apache.log4j.Logger; * application is "mounted". JSPApplicationDispatcher can assume that * the RequestContext argument it receives is an * SiteNodeRequestContext. - * - * @deprecated Use {@link com.arsdigita.web.WebContext} instead. - * @author Bill Schneider - * @version $Revision: #14 $ $Date: 2004/08/16 $ - * @since 4.5 * @see com.arsdigita.dispatcher.JSPApplicationDispatcher + * + * @author Bill Schneider + * @since 4.5 + * @version $Id: SiteNodeRequestContext.java 287 2005-02-22 00:29:02Z sskracic $ + * @deprecated Use {@link com.arsdigita.web.WebContext} instead. */ public class SiteNodeRequestContext extends KernelRequestContext { - public static final String versionId = - "$Id: SiteNodeRequestContext.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (SiteNodeRequestContext.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProvider.java b/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProvider.java index 5ed2a82c6..e02e818ca 100755 --- a/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProvider.java +++ b/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProvider.java @@ -36,10 +36,9 @@ import javax.servlet.http.HttpServletRequest; * request. *

* - * @version $Revision: #12 $ $Date: 2004/08/16 $ + * @version $Id: CharsetEncodingProvider.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CharsetEncodingProvider implements ParameterProvider { - public final static String versionId = "$Id: CharsetEncodingProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static StringParameter s_encodingParam = new StringParameter(Globalization.ENCODING_PARAM_NAME); diff --git a/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProviderInitializer.java b/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProviderInitializer.java index a83b74c52..ef8e1ef44 100755 --- a/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProviderInitializer.java +++ b/ccm-core/src/com/arsdigita/toolbox/CharsetEncodingProviderInitializer.java @@ -29,12 +29,10 @@ import org.apache.log4j.Logger; * Add the character set encoding provider. *

* - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: CharsetEncodingProviderInitializer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class CharsetEncodingProviderInitializer implements Initializer { - public final static String versionId = "$Id: CharsetEncodingProviderInitializer.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(CharsetEncodingProviderInitializer.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/Security.java b/ccm-core/src/com/arsdigita/toolbox/Security.java index ab872fd20..8ba90582e 100755 --- a/ccm-core/src/com/arsdigita/toolbox/Security.java +++ b/ccm-core/src/com/arsdigita/toolbox/Security.java @@ -24,12 +24,10 @@ import com.arsdigita.kernel.Party; *

An interface for making access checks.

* * @author Michael Pih - * @version $Revision: #8 $ $DateTime: 2004/08/16 18:10:38 $ + * @version $Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface Security { - public static final String versionId = "$Id: Security.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Determine whether a party has access to a particular action. * diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/AbstractCollectionTable.java b/ccm-core/src/com/arsdigita/toolbox/ui/AbstractCollectionTable.java index a08d09676..2dcb46b46 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/AbstractCollectionTable.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/AbstractCollectionTable.java @@ -57,6 +57,7 @@ import java.util.ArrayList; * * @author Randy Graebner * @version $Revision: #12 $ $Date: 2004/08/16 $ + * @version $Id: $ */ public abstract class AbstractCollectionTable extends Table diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/AbstractDataQueryBuilder.java b/ccm-core/src/com/arsdigita/toolbox/ui/AbstractDataQueryBuilder.java index bf7df5127..33332b545 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/AbstractDataQueryBuilder.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/AbstractDataQueryBuilder.java @@ -26,12 +26,12 @@ import com.arsdigita.persistence.DataQuery; /** * An abstract class that implements DataQueryBuilder, allowing on the fly * implementations of DataQueryBuilder. + * + * @version $Id: AbstractDataQueryBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class AbstractDataQueryBuilder extends LockableImpl implements DataQueryBuilder { - public static final String versionId = "$Id: AbstractDataQueryBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Perform all neccessary database operations and return * a {@link DataQuery} for the {@link DataTable} to use diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ActionGroup.java b/ccm-core/src/com/arsdigita/toolbox/ui/ActionGroup.java index 05ed48a3c..c53b862f0 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ActionGroup.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ActionGroup.java @@ -34,10 +34,6 @@ import org.apache.log4j.Logger; * @version $Id: ActionGroup.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ActionGroup extends ComponentSet { - public static final String versionId = - "$Id: ActionGroup.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ActionGroup.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ComponentMap.java b/ccm-core/src/com/arsdigita/toolbox/ui/ComponentMap.java index 5221f1006..453b6e41e 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ComponentMap.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ComponentMap.java @@ -28,12 +28,12 @@ import com.arsdigita.xml.Element; import java.util.Iterator; import org.apache.log4j.Logger; +/** + * + * @version $Id: ComponentMap.java 287 2005-02-22 00:29:02Z sskracic $ + */ public abstract class ComponentMap extends SimpleComponent implements Resettable { - public static final String versionId = - "$Id: ComponentMap.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ComponentMap.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ComponentSet.java b/ccm-core/src/com/arsdigita/toolbox/ui/ComponentSet.java index a7afd6097..c3f9ccd70 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ComponentSet.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ComponentSet.java @@ -28,12 +28,12 @@ import java.util.ArrayList; import java.util.Iterator; import org.apache.log4j.Logger; +/** + * + * @version $Id: ComponentSet.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ComponentSet extends SimpleComponent implements Resettable { - public static final String versionId = - "$Id: ComponentSet.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ComponentSet.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ContextBar.java b/ccm-core/src/com/arsdigita/toolbox/ui/ContextBar.java index 9f77c59fd..8e14e50d2 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ContextBar.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ContextBar.java @@ -36,10 +36,6 @@ import org.apache.log4j.Logger; * @version $Id: ContextBar.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class ContextBar extends SimpleComponent { - public static final String versionId = - "$Id: ContextBar.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ContextBar.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/DataTable.java b/ccm-core/src/com/arsdigita/toolbox/ui/DataTable.java index 7b68f305d..1bce194d4 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/DataTable.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/DataTable.java @@ -134,8 +134,6 @@ import org.apache.log4j.Logger; */ public class DataTable extends Table implements PaginationModelBuilder { - public static final String versionId = "$Id: DataTable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(DataTable.class.getName()); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetail.java b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetail.java index 96120de54..459852b80 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetail.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetail.java @@ -31,7 +31,6 @@ import java.util.Iterator; * @version $Id: ItemDetail.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ItemDetail extends SimpleComponent { - public static final String versionId = "$Id: ItemDetail.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private ItemDetailModelBuilder m_builder; diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModel.java b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModel.java index 0d0204291..3dc03f006 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModel.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModel.java @@ -28,7 +28,6 @@ import java.util.Iterator; * @version $Id: ItemDetailModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ItemDetailModel { - public static final String versionId = "$Id: ItemDetailModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public String getTitle(PageState pageState); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModelBuilder.java b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModelBuilder.java index 89b740f1a..2f068b653 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModelBuilder.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ItemDetailModelBuilder.java @@ -28,7 +28,6 @@ import com.arsdigita.bebop.PageState; * @version $Id: ItemDetailModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ItemDetailModelBuilder extends Lockable { - public static final String versionId = "$Id: ItemDetailModelBuilder.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public ItemDetailModel buildModel(PageState pageState); } diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ItemEditor.java b/ccm-core/src/com/arsdigita/toolbox/ui/ItemEditor.java index f968ea13d..71ba2bec0 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ItemEditor.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ItemEditor.java @@ -32,11 +32,11 @@ import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.util.Assert; import org.apache.log4j.Logger; +/** + * + * @version $Id: ItemEditor.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ItemEditor extends ModalContainer { - public static final String versionId = - "$Id: ItemEditor.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ItemEditor.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/LayoutPanel.java b/ccm-core/src/com/arsdigita/toolbox/ui/LayoutPanel.java index 264d721e3..a2195d8f2 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/LayoutPanel.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/LayoutPanel.java @@ -31,10 +31,6 @@ import org.apache.log4j.Logger; * @version $Id: LayoutPanel.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LayoutPanel extends ComponentMap { - public static final String versionId = - "$Id: LayoutPanel.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(LayoutPanel.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/ModalPanel.java b/ccm-core/src/com/arsdigita/toolbox/ui/ModalPanel.java index f71cdb8c2..8839eaafd 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/ModalPanel.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/ModalPanel.java @@ -45,11 +45,11 @@ import com.arsdigita.xml.Element; import java.util.Iterator; import org.apache.log4j.Logger; +/** + * + * @version $Id: ModalPanel.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class ModalPanel extends ComponentMap { - public static final String versionId = - "$Id: ModalPanel.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ModalPanel.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/NullComponent.java b/ccm-core/src/com/arsdigita/toolbox/ui/NullComponent.java index d6b5c85e9..d9f2972dd 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/NullComponent.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/NullComponent.java @@ -33,10 +33,6 @@ import javax.servlet.ServletException; * @version $Id: NullComponent.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class NullComponent implements Component { - public static final String versionId = - "$Id: NullComponent.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; public void generateXML(PageState state, Element parent) { // Empty diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/PropertyList.java b/ccm-core/src/com/arsdigita/toolbox/ui/PropertyList.java index 1ae5026db..3dde06cdf 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/PropertyList.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/PropertyList.java @@ -36,10 +36,6 @@ import org.apache.log4j.Logger; * @version $Id: PropertyList.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class PropertyList extends SimpleComponent { - public static final String versionId = - "$Id: PropertyList.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(PropertyList.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/Section.java b/ccm-core/src/com/arsdigita/toolbox/ui/Section.java index 886712215..d657d04e8 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/Section.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/Section.java @@ -40,10 +40,6 @@ import org.apache.log4j.Logger; * @version $Id: Section.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Section extends SimpleComponent { - public static final String versionId = - "$Id: Section.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Section.class); diff --git a/ccm-core/src/com/arsdigita/toolbox/ui/SelectionPanel.java b/ccm-core/src/com/arsdigita/toolbox/ui/SelectionPanel.java index 15114eaf3..0bab46aac 100755 --- a/ccm-core/src/com/arsdigita/toolbox/ui/SelectionPanel.java +++ b/ccm-core/src/com/arsdigita/toolbox/ui/SelectionPanel.java @@ -35,11 +35,11 @@ import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.Assert; import org.apache.log4j.Logger; +/** + * + * @version $Id: SelectionPanel.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class SelectionPanel extends LayoutPanel implements Resettable { - public static final String versionId = - "$Id: SelectionPanel.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(SelectionPanel.class); diff --git a/ccm-core/src/com/arsdigita/ui/NowDateTime.java b/ccm-core/src/com/arsdigita/ui/NowDateTime.java index a18855764..a1d6b95d0 100755 --- a/ccm-core/src/com/arsdigita/ui/NowDateTime.java +++ b/ccm-core/src/com/arsdigita/ui/NowDateTime.java @@ -46,12 +46,10 @@ import org.apache.log4j.Logger; * classname="com.arsdigita.ui.NowDateTime" /> * * - * @version $Revision: 1.2 $ $Date: 2005/01/07 18:48:45 $ + * @version $Id: NowDateTime.java 469 2005-03-20 23:12:44Z mbooth $ */ public class NowDateTime extends SimpleComponent { - public static final String versionId = "$Id: NowDateTime.java 469 2005-03-20 23:12:44Z mbooth $"; - private static Logger log = Logger.getLogger(NowDateTime.class);; private static final String TAG_NOWDATETIME = "ui:nowDateTime"; diff --git a/ccm-core/src/com/arsdigita/ui/admin/ContextBar.java b/ccm-core/src/com/arsdigita/ui/admin/ContextBar.java index 9cbc664ef..1d16599f0 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/ContextBar.java +++ b/ccm-core/src/com/arsdigita/ui/admin/ContextBar.java @@ -34,8 +34,6 @@ import com.arsdigita.globalization.GlobalizedMessage; public class ContextBar extends BoxPanel implements AdminConstants { - public static final String versionId = "$Id: ContextBar.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // String catalog private static final GlobalizedMessage WORKSPACE = new GlobalizedMessage("ui.admin.contextBar.workspace", BUNDLE_NAME); diff --git a/ccm-core/src/com/arsdigita/ui/admin/ExistingGroupAddPane.java b/ccm-core/src/com/arsdigita/ui/admin/ExistingGroupAddPane.java index 9026ffea1..3b30fb3fc 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/ExistingGroupAddPane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/ExistingGroupAddPane.java @@ -21,10 +21,9 @@ import com.arsdigita.ui.admin.GroupAdministrationTab; /** * Series of screens required for adding existing groups as subgroups - * based on existing functionality for adding permissions to a folder in content/admin + * @version $Id: ExistingGroupAddPane.java,v 1.4 2004/06/21 11:34:03 cgyg9330 Exp $ by $Author: cgyg9330 $ */ public class ExistingGroupAddPane extends SimpleContainer implements AdminConstants { - public static final String versionId = - "$Id: ExistingGroupAddPane.java,v 1.4 2004/06/21 11:34:03 cgyg9330 Exp $ by $Author: cgyg9330 $, $DateTime: 2003/01/09 06:28:37 $"; private static final Logger s_log = Logger.getLogger(ExistingGroupAddPane.class); diff --git a/ccm-core/src/com/arsdigita/ui/admin/GroupEditForm.java b/ccm-core/src/com/arsdigita/ui/admin/GroupEditForm.java index 206dcd62b..c0268cf5b 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/GroupEditForm.java +++ b/ccm-core/src/com/arsdigita/ui/admin/GroupEditForm.java @@ -38,7 +38,6 @@ import com.arsdigita.bebop.FormProcessException; class GroupEditForm extends GroupForm implements AdminConstants, FormInitListener, FormProcessListener { - public static final String versionId = "$Id: GroupEditForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private GroupAdministrationTab m_parent; diff --git a/ccm-core/src/com/arsdigita/ui/admin/GroupForm.java b/ccm-core/src/com/arsdigita/ui/admin/GroupForm.java index b90e7f9de..2f0981a7e 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/GroupForm.java +++ b/ccm-core/src/com/arsdigita/ui/admin/GroupForm.java @@ -35,7 +35,6 @@ import com.arsdigita.bebop.ColumnPanel; * @version $Id: GroupForm.java 287 2005-02-22 00:29:02Z sskracic $ */ class GroupForm extends Form implements AdminConstants { - public static final String versionId = "$Id: GroupForm.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; protected TextField m_name; protected TextField m_email; diff --git a/ccm-core/src/com/arsdigita/ui/admin/GroupSearchAndListModel.java b/ccm-core/src/com/arsdigita/ui/admin/GroupSearchAndListModel.java index 84dfdd1ee..ac7335f78 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/GroupSearchAndListModel.java +++ b/ccm-core/src/com/arsdigita/ui/admin/GroupSearchAndListModel.java @@ -33,8 +33,6 @@ import java.math.BigDecimal; class GroupSearchAndListModel implements SearchAndListModel { - public static final String versionId = "$Id: GroupSearchAndListModel.java 1508 2007-03-22 00:04:22Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; - /** * A DataQuery used to perform the search */ diff --git a/ccm-core/src/com/arsdigita/ui/admin/PartyListModel.java b/ccm-core/src/com/arsdigita/ui/admin/PartyListModel.java index 14d2ab33e..1ae5032a5 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/PartyListModel.java +++ b/ccm-core/src/com/arsdigita/ui/admin/PartyListModel.java @@ -23,9 +23,12 @@ import com.arsdigita.kernel.PartyCollection; import com.arsdigita.bebop.list.ListModel; +/** + * + * @version $Id: PartyListModel.java 287 2005-02-22 00:29:02Z sskracic $ + */ class PartyListModel implements ListModel { - public static final String versionId = "$Id: PartyListModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private PartyCollection m_parties; private Party m_currentParty = null; diff --git a/ccm-core/src/com/arsdigita/ui/admin/SearchAndListModel.java b/ccm-core/src/com/arsdigita/ui/admin/SearchAndListModel.java index 54b2d212d..5396dd36d 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/SearchAndListModel.java +++ b/ccm-core/src/com/arsdigita/ui/admin/SearchAndListModel.java @@ -24,12 +24,11 @@ import com.arsdigita.bebop.list.ListModel; * * * @author David Dao + * @version $Id: SearchAndListModel.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface SearchAndListModel extends ListModel { - public static final String versionId = "$Id: SearchAndListModel.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * Specify the user's search. */ diff --git a/ccm-core/src/com/arsdigita/ui/admin/SubsiteDispatcher.java b/ccm-core/src/com/arsdigita/ui/admin/SubsiteDispatcher.java index 1c6ff2ba7..853397bcb 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/SubsiteDispatcher.java +++ b/ccm-core/src/com/arsdigita/ui/admin/SubsiteDispatcher.java @@ -48,10 +48,6 @@ import org.apache.log4j.Logger; * @version $Id: SubsiteDispatcher.java 287 2005-02-22 00:29:02Z sskracic $ */ class SubsiteDispatcher extends BebopMapDispatcher { - public static final String versionId = - "$Id: SubsiteDispatcher.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (SubsiteDispatcher.class); diff --git a/ccm-core/src/com/arsdigita/ui/admin/URLValidationListener.java b/ccm-core/src/com/arsdigita/ui/admin/URLValidationListener.java index d8f5c9aea..f67ab6ba2 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/URLValidationListener.java +++ b/ccm-core/src/com/arsdigita/ui/admin/URLValidationListener.java @@ -44,8 +44,6 @@ import java.net.MalformedURLException; public class URLValidationListener implements ParameterListener { - public static final String versionId = "$Id: URLValidationListener.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * A label for the item being validated */ diff --git a/ccm-core/src/com/arsdigita/ui/admin/UserBrowsePane.java b/ccm-core/src/com/arsdigita/ui/admin/UserBrowsePane.java index 46c3cdb01..91cd1233e 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/UserBrowsePane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/UserBrowsePane.java @@ -78,6 +78,7 @@ import org.apache.log4j.Logger; * * @author David Dao * @author Ron Henderson + * @version $Id: UserBrowsePane.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $ */ class UserBrowsePane extends SegmentedPanel @@ -87,10 +88,6 @@ class UserBrowsePane extends SegmentedPanel ActionListener, AdminConstants, ChangeListener { - public static final String versionId = - "$Id: UserBrowsePane.java 1372 2006-11-13 09:22:54Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(UserBrowsePane.class); diff --git a/ccm-core/src/com/arsdigita/ui/admin/UserSummaryPane.java b/ccm-core/src/com/arsdigita/ui/admin/UserSummaryPane.java index cfb7cf05b..60faa67a0 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/UserSummaryPane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/UserSummaryPane.java @@ -43,13 +43,11 @@ import com.arsdigita.bebop.SegmentedPanel; /** * * @author David Dao - * + * @version $Id: UserSummaryPane.java 1486 2007-03-18 16:47:26Z apevec $ */ class UserSummaryPane extends SegmentedPanel implements AdminConstants, Resettable { - public static final String versionId = "$Id: UserSummaryPane.java 1486 2007-03-18 16:47:26Z apevec $ by $Author: apevec $, $DateTime: 2004/08/16 18:10:38 $"; - private UserSummaryBodyPane m_body; public UserSummaryPane(AdminSplitPanel panel, UserBrowsePane userBrowsePane) { diff --git a/ccm-core/src/com/arsdigita/ui/admin/Utilities.java b/ccm-core/src/com/arsdigita/ui/admin/Utilities.java index d849628a2..caa7f5aed 100755 --- a/ccm-core/src/com/arsdigita/ui/admin/Utilities.java +++ b/ccm-core/src/com/arsdigita/ui/admin/Utilities.java @@ -32,10 +32,10 @@ import org.apache.log4j.Logger; * preparing search query strings and, well, not much else. * * @author Kevin Scaldeferri + * @version $Id: Utilities.java 287 2005-02-22 00:29:02Z sskracic $ */ final class Utilities { - public static final String versionId = "$Id: Utilities.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Utilities.class); /** diff --git a/ccm-core/src/com/arsdigita/util/Assert.java b/ccm-core/src/com/arsdigita/util/Assert.java index 464aaa629..e2392fefc 100755 --- a/ccm-core/src/com/arsdigita/util/Assert.java +++ b/ccm-core/src/com/arsdigita/util/Assert.java @@ -127,6 +127,29 @@ public class Assert { } } + /** + * Asserts that an arbitrary condition is true and throws an + * error with message message if the condition is + * false. + * + * @param condition The condition asserted + * @param message An error message + * @throws AssertionError if the condition is false + * @deprecated use Assert.isTrue(condition, message) instead + * (we will follow the standard naming scheme) + */ + public static final void truth(final boolean condition, + final String message) { + Assert.isTrue(condition, message); + + + // if (!condition) { + // error(message); + // + // throw new AssertionError(message); + // } + } + /** * Asserts that an arbitrary condition is true and throws an * error with message message if the condition is @@ -143,6 +166,26 @@ public class Assert { } } + /** + * Asserts that an arbitrary condition is true and throws an + * error with message message if the condition is + * false. + * + * @param condition The condition asserted + * @throws AssertionError if the condition is false + * @deprecated use Assert.isTrue(final boolean condition) instead + * (we will follow the standard naming scheme) + */ + public static final void truth(final boolean condition) { + Assert.isTrue(condition); + + // if (!condition) { + // error(DEFAULT_MESSAGE); + // + // throw new AssertionError(DEFAULT_MESSAGE); + // } + } + /** * Asserts that an arbitrary condition is false and throws an * error if the condition is true. @@ -252,7 +295,7 @@ public class Assert { * Verifies that lockable is not locked and * throws an error if it is. * - * @param lockable The object that must not be isLocked + * @param lockable The object that must not be locked * @see com.arsdigita.util.Lockable */ public static final void isUnlocked(final Lockable lockable) { @@ -266,13 +309,13 @@ public class Assert { } /** - * Verifies that two values are isEqual (according to their equals + * Verifies that two values are equal (according to their equals * method, unless value1 is null, then according to * ==). * * @param value1 The first value to be compared * @param value2 The second - * @throws AssertionError if the arguments are isNotEqual + * @throws AssertionError if the arguments are unequal */ public static final void isEqual(final Object value1, final Object value2) { @@ -296,13 +339,13 @@ public class Assert { } /** - * Verifies that two values are isEqual (according to their equals + * Verifies that two values are equal (according to their equals * method, unless value1 is null, then according to * ==). * * @param value1 The first value to be compared * @param value2 The second - * @throws AssertionError if the arguments are isNotEqual + * @throws AssertionError if the arguments are unequal */ public static final void isEqual(final Object value1, final Object value2, @@ -323,7 +366,7 @@ public class Assert { } /** - * Verifies that two values are not isEqual (according to their + * Verifies that two values are not equal (according to their * equals method, unless value1 is null, then * according to ==). * @@ -439,7 +482,6 @@ public class Assert { final String message) { Assert.isTrue(condition, message); - // if (!condition) { // error(message); // @@ -550,7 +592,7 @@ public class Assert { } /** - * Verify that two values are isEqual (according to their equals method, + * Verify that two values are equal (according to their equals method, * unless expected is null, then according to ==). * * @param expected Expected value. @@ -563,7 +605,7 @@ public class Assert { } /** - * Verify that two values are isEqual (according to their equals method, + * Verify that two values are equal (according to their equals method, * unless expected is null, then according to ==). * * @param expected Expected value. @@ -591,7 +633,7 @@ public class Assert { } /** - * Verify that two values are isEqual. + * Verify that two values are equal. * * @param expected Expected value. * @param actual Actual value. @@ -603,7 +645,7 @@ public class Assert { } /** - * Verify that two values are isEqual. + * Verify that two values are equal. * * @param expected Expected value. * @param actual Actual value. @@ -638,8 +680,8 @@ public class Assert { } */ /** - * Verify that the model is isLocked and throw a runtime exception - * if it is isLocked. + * Verify that the model is locked and throw a runtime exception + * if it is locked. * // * @deprecated Use {@link #isUnlocked(Lockable)} instead */ diff --git a/ccm-core/src/com/arsdigita/util/Cache.java b/ccm-core/src/com/arsdigita/util/Cache.java index 3ca04124d..96e63c97d 100755 --- a/ccm-core/src/com/arsdigita/util/Cache.java +++ b/ccm-core/src/com/arsdigita/util/Cache.java @@ -29,13 +29,11 @@ import java.util.Iterator; * cache, whose methods are threadsafe. * * @author Bill Schneider - * @version $Revision: #9 $, $Date: 2004/08/16 $ + * @version $Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Cache { - public static final String versionId = "$Id: Cache.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // map keys to their values private static Cache s_instance = new Cache(32000); diff --git a/ccm-core/src/com/arsdigita/util/CheckedWrapperException.java b/ccm-core/src/com/arsdigita/util/CheckedWrapperException.java index c2872314c..e3e617553 100755 --- a/ccm-core/src/com/arsdigita/util/CheckedWrapperException.java +++ b/ccm-core/src/com/arsdigita/util/CheckedWrapperException.java @@ -39,7 +39,6 @@ package com.arsdigita.util; */ public class CheckedWrapperException extends Exception { - public static final String versionId = "$Id: CheckedWrapperException.java 287 2005-02-22 00:29:02Z sskracic $"; private static final String NEW_LINE = System.getProperty("line.separator"); Throwable m_rootCause; diff --git a/ccm-core/src/com/arsdigita/util/Classes.java b/ccm-core/src/com/arsdigita/util/Classes.java index 24d012e84..7cec0bec9 100755 --- a/ccm-core/src/com/arsdigita/util/Classes.java +++ b/ccm-core/src/com/arsdigita/util/Classes.java @@ -29,12 +29,9 @@ import java.util.Arrays; * classes. * * @author Justin Ross + * @version $Id: Classes.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class Classes { - public static final String versionId = - "$Id: Classes.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Classes.class); diff --git a/ccm-core/src/com/arsdigita/util/Files.java b/ccm-core/src/com/arsdigita/util/Files.java index f8525caff..6ad8232fa 100755 --- a/ccm-core/src/com/arsdigita/util/Files.java +++ b/ccm-core/src/com/arsdigita/util/Files.java @@ -44,13 +44,11 @@ import org.apache.log4j.Logger; * * @author Rafael H. Schloming <rhs@mit.edu> * @author Randy Graebner <randyg@alum.mit.edu> - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: Files.java 738 2005-09-01 12:36:52Z sskracic $ **/ public final class Files { - public final static String versionId = "$Id: Files.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Files.class); diff --git a/ccm-core/src/com/arsdigita/util/HierarchyDenormalization.java b/ccm-core/src/com/arsdigita/util/HierarchyDenormalization.java index d8383b0b4..e881bad30 100755 --- a/ccm-core/src/com/arsdigita/util/HierarchyDenormalization.java +++ b/ccm-core/src/com/arsdigita/util/HierarchyDenormalization.java @@ -36,12 +36,10 @@ import org.apache.log4j.Logger; *

* * @author Randy Graebner - * @version $Revision: #14 $ $Date: 2004/08/16 $ + * @version $Id: HierarchyDenormalization.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class HierarchyDenormalization { - public final static String versionId = "$Id: HierarchyDenormalization.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final static Logger s_log = Logger.getLogger(HierarchyDenormalization.class); diff --git a/ccm-core/src/com/arsdigita/util/JavaPropertyReader.java b/ccm-core/src/com/arsdigita/util/JavaPropertyReader.java index d3c03e238..298c6e6d4 100755 --- a/ccm-core/src/com/arsdigita/util/JavaPropertyReader.java +++ b/ccm-core/src/com/arsdigita/util/JavaPropertyReader.java @@ -38,10 +38,6 @@ import org.apache.log4j.Logger; * @version $Id: JavaPropertyReader.java 287 2005-02-22 00:29:02Z sskracic $ */ public class JavaPropertyReader implements ParameterReader { - public final static String versionId = - "$Id: JavaPropertyReader.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (JavaPropertyReader.class); diff --git a/ccm-core/src/com/arsdigita/util/JavaPropertyWriter.java b/ccm-core/src/com/arsdigita/util/JavaPropertyWriter.java index 0fabf1063..d592e9411 100755 --- a/ccm-core/src/com/arsdigita/util/JavaPropertyWriter.java +++ b/ccm-core/src/com/arsdigita/util/JavaPropertyWriter.java @@ -37,10 +37,6 @@ import org.apache.log4j.Logger; * @version $Id: JavaPropertyWriter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class JavaPropertyWriter implements ParameterWriter { - public final static String versionId = - "$Id: JavaPropertyWriter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (JavaPropertyWriter.class); diff --git a/ccm-core/src/com/arsdigita/util/Lockable.java b/ccm-core/src/com/arsdigita/util/Lockable.java index f70080a55..fc90b3bdd 100755 --- a/ccm-core/src/com/arsdigita/util/Lockable.java +++ b/ccm-core/src/com/arsdigita/util/Lockable.java @@ -58,7 +58,6 @@ package com.arsdigita.util; public interface Lockable { - public static final String versionId = "$Id: Lockable.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Lock an object. Locked objects are to be considered immutable. Any * attempt to modify them, e.g., through a setXXX method diff --git a/ccm-core/src/com/arsdigita/util/OrderedMap.java b/ccm-core/src/com/arsdigita/util/OrderedMap.java index 304ed0046..ea1d1542f 100755 --- a/ccm-core/src/com/arsdigita/util/OrderedMap.java +++ b/ccm-core/src/com/arsdigita/util/OrderedMap.java @@ -29,12 +29,9 @@ import org.apache.log4j.Logger; * * @deprecated use {@link com.arsdigita.util.SequentialMap} instead * @author Justin Ross <jross@redhat.com> + * @version $Id: OrderedMap.java 287 2005-02-22 00:29:02Z sskracic $ */ public class OrderedMap extends TreeMap { - public static final String versionId = - "$Id: OrderedMap.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(OrderedMap.class); diff --git a/ccm-core/src/com/arsdigita/util/Pair.java b/ccm-core/src/com/arsdigita/util/Pair.java index f1d0adc7a..f96c94395 100755 --- a/ccm-core/src/com/arsdigita/util/Pair.java +++ b/ccm-core/src/com/arsdigita/util/Pair.java @@ -28,12 +28,10 @@ import java.util.Map; *

* * @author David Lutterkort - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Pair.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Pair implements Map.Entry, Cloneable { - public final static String versionId = "$Id: Pair.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_key; private Object m_value; diff --git a/ccm-core/src/com/arsdigita/util/ParameterProvider.java b/ccm-core/src/com/arsdigita/util/ParameterProvider.java index b1144b06e..4cce609fb 100755 --- a/ccm-core/src/com/arsdigita/util/ParameterProvider.java +++ b/ccm-core/src/com/arsdigita/util/ParameterProvider.java @@ -21,9 +21,12 @@ package com.arsdigita.util; import java.util.Set; import javax.servlet.http.HttpServletRequest; +/** + * + * @version$Id: ParameterProvider.java 287 2005-02-22 00:29:02Z sskracic $ + */ public interface ParameterProvider { - public static final String versionId = "$Id: ParameterProvider.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; /** * Return the set of bebop ParameterModels that this provides. **/ diff --git a/ccm-core/src/com/arsdigita/util/Record.java b/ccm-core/src/com/arsdigita/util/Record.java index 4c96ac39c..cfaf11cf1 100755 --- a/ccm-core/src/com/arsdigita/util/Record.java +++ b/ccm-core/src/com/arsdigita/util/Record.java @@ -27,10 +27,6 @@ import org.apache.log4j.Logger; * @version $Id: Record.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class Record { - public static final String versionId = - "$Id: Record.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Record.class); diff --git a/ccm-core/src/com/arsdigita/util/Reporter.java b/ccm-core/src/com/arsdigita/util/Reporter.java index 22184164e..a55f89b63 100755 --- a/ccm-core/src/com/arsdigita/util/Reporter.java +++ b/ccm-core/src/com/arsdigita/util/Reporter.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: Reporter.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class Reporter { - public static final String versionId = - "$Id: Reporter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Reporter.class); diff --git a/ccm-core/src/com/arsdigita/util/ResourceManager.java b/ccm-core/src/com/arsdigita/util/ResourceManager.java index 5a964db41..224f065d2 100755 --- a/ccm-core/src/com/arsdigita/util/ResourceManager.java +++ b/ccm-core/src/com/arsdigita/util/ResourceManager.java @@ -34,8 +34,9 @@ import org.apache.log4j.Logger; * Handles a very similiar scope of tasks as c.ad.runtime.CCM. Both should be * integrated into a single class, e.g. CCMResourceManager to simplify and * clean-up of the API! + * + * @version $Id: ResourceManager.java 287 2005-02-22 00:29:02Z sskracic $ */ - public class ResourceManager { private final static String CONFIGURE_MESSAGE = @@ -50,11 +51,6 @@ public class ResourceManager { private File m_webappRoot; private ServletContext m_servletContext; - public static final String versionId = - "$Id: ResourceManager.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - /** * Empty constructor, which we make private to enforce the singleton * pattern. diff --git a/ccm-core/src/com/arsdigita/util/SequentialMap.java b/ccm-core/src/com/arsdigita/util/SequentialMap.java index 2afc7a7dc..c23b3b388 100755 --- a/ccm-core/src/com/arsdigita/util/SequentialMap.java +++ b/ccm-core/src/com/arsdigita/util/SequentialMap.java @@ -41,12 +41,10 @@ import java.util.Set; *

* * @author David Lutterkort - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: SequentialMap.java 287 2005-02-22 00:29:02Z sskracic $ */ public class SequentialMap extends AbstractMap implements Map { - public final static String versionId = "$Id: SequentialMap.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ArrayList m_entries = null; private Set m_entrySet = null; diff --git a/ccm-core/src/com/arsdigita/util/ServletUtils.java b/ccm-core/src/com/arsdigita/util/ServletUtils.java index 0a99ba494..4cdadcadf 100755 --- a/ccm-core/src/com/arsdigita/util/ServletUtils.java +++ b/ccm-core/src/com/arsdigita/util/ServletUtils.java @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest; /** * A (static) class of generally-useful Java servlet utilities. * @author Bill Schneider + * + * @version $Id: ServletUtils.java 610 2005-06-23 15:50:05Z sskracic $ */ public class ServletUtils { - public static final String versionId = "$Id: ServletUtils.java 610 2005-06-23 15:50:05Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ServletUtils() { } /** diff --git a/ccm-core/src/com/arsdigita/util/StringUtils.java b/ccm-core/src/com/arsdigita/util/StringUtils.java index d00dffe74..852e71d0a 100755 --- a/ccm-core/src/com/arsdigita/util/StringUtils.java +++ b/ccm-core/src/com/arsdigita/util/StringUtils.java @@ -674,7 +674,7 @@ public class StringUtils { /** * Strip extra white space from a string. This replaces any white space * character or consecutive white space characters with a single space. - * It is useful when comparing strings that should be isEqual except for + * It is useful when comparing strings that should be equal except for * possible differences in white space. Example: input = "I \ndo\tsee". * Output = "I do see". * @param s string that may contain extra white space diff --git a/ccm-core/src/com/arsdigita/util/SystemProperties.java b/ccm-core/src/com/arsdigita/util/SystemProperties.java index de0e4ae71..4167b917d 100755 --- a/ccm-core/src/com/arsdigita/util/SystemProperties.java +++ b/ccm-core/src/com/arsdigita/util/SystemProperties.java @@ -33,10 +33,6 @@ import org.apache.log4j.Logger; * @version $Id: SystemProperties.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class SystemProperties { - public final static String versionId = - "$Id: SystemProperties.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (SystemProperties.class); diff --git a/ccm-core/src/com/arsdigita/util/Tracer.java b/ccm-core/src/com/arsdigita/util/Tracer.java index 34697b303..13c16e45d 100755 --- a/ccm-core/src/com/arsdigita/util/Tracer.java +++ b/ccm-core/src/com/arsdigita/util/Tracer.java @@ -27,10 +27,6 @@ import org.apache.log4j.Logger; * @version $Id: Tracer.java 738 2005-09-01 12:36:52Z sskracic $ */ public final class Tracer { - public static final String versionId = - "$Id: Tracer.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Tracer.class); diff --git a/ccm-core/src/com/arsdigita/util/TypedText.java b/ccm-core/src/com/arsdigita/util/TypedText.java index c755bcb86..39d07bf4e 100755 --- a/ccm-core/src/com/arsdigita/util/TypedText.java +++ b/ccm-core/src/com/arsdigita/util/TypedText.java @@ -25,12 +25,11 @@ package com.arsdigita.util; * preformatted text. * * @author Kevin Scaldeferri + * @version $Id: TypedText.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TypedText { - public static final String versionId = "$Id: TypedText.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String TEXT_HTML = "text/html"; public static final String TEXT_PLAIN = "text/plain"; public static final String TEXT_PREFORMATTED = diff --git a/ccm-core/src/com/arsdigita/util/URLRewriter.java b/ccm-core/src/com/arsdigita/util/URLRewriter.java index dca21998b..2065ddef5 100755 --- a/ccm-core/src/com/arsdigita/util/URLRewriter.java +++ b/ccm-core/src/com/arsdigita/util/URLRewriter.java @@ -34,12 +34,10 @@ import org.apache.log4j.Logger; * set of registered ParameterProviders. This makes * cookieless login possible, by re-writing URLs to include a session * ID parameter. + * + * @version $Id: URLRewriter.java 287 2005-02-22 00:29:02Z sskracic $ */ public class URLRewriter { - public static final String versionId = - "$Id: URLRewriter.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(URLRewriter.class); diff --git a/ccm-core/src/com/arsdigita/util/UncheckedWrapperException.java b/ccm-core/src/com/arsdigita/util/UncheckedWrapperException.java index 0c1cb8207..51d2da536 100755 --- a/ccm-core/src/com/arsdigita/util/UncheckedWrapperException.java +++ b/ccm-core/src/com/arsdigita/util/UncheckedWrapperException.java @@ -42,8 +42,6 @@ import org.apache.log4j.Logger; */ public class UncheckedWrapperException extends RuntimeException { - public static final String versionId = "$Id: UncheckedWrapperException.java 287 2005-02-22 00:29:02Z sskracic $"; - static { Exceptions.registerUnwrapper( UncheckedWrapperException.class, diff --git a/ccm-core/src/com/arsdigita/util/WrappedError.java b/ccm-core/src/com/arsdigita/util/WrappedError.java index ab52848df..b8fce13f7 100755 --- a/ccm-core/src/com/arsdigita/util/WrappedError.java +++ b/ccm-core/src/com/arsdigita/util/WrappedError.java @@ -35,8 +35,6 @@ import org.apache.log4j.Logger; */ public class WrappedError extends Error { - public static final String versionId = "$Id: WrappedError.java 287 2005-02-22 00:29:02Z sskracic $"; - static { Exceptions.registerUnwrapper( WrappedError.class, diff --git a/ccm-core/src/com/arsdigita/util/servlet/Cookies.java b/ccm-core/src/com/arsdigita/util/servlet/Cookies.java index d34b8734e..78785cae2 100755 --- a/ccm-core/src/com/arsdigita/util/servlet/Cookies.java +++ b/ccm-core/src/com/arsdigita/util/servlet/Cookies.java @@ -37,10 +37,6 @@ import org.apache.log4j.Logger; * @version $Id: Cookies.java 287 2005-02-22 00:29:02Z sskracic $ */ public class Cookies { - public static final String versionId = - "$Id: Cookies.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Cookies.class); diff --git a/ccm-core/src/com/arsdigita/util/servlet/HttpHost.java b/ccm-core/src/com/arsdigita/util/servlet/HttpHost.java index 45f7129b0..5a910e780 100755 --- a/ccm-core/src/com/arsdigita/util/servlet/HttpHost.java +++ b/ccm-core/src/com/arsdigita/util/servlet/HttpHost.java @@ -31,10 +31,6 @@ import org.apache.log4j.Logger; * @version $Id: HttpHost.java 287 2005-02-22 00:29:02Z sskracic $ */ public class HttpHost { - public static final String versionId = - "$Id: HttpHost.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(HttpHost.class); diff --git a/ccm-core/src/com/arsdigita/util/servlet/HttpParameterListener.java b/ccm-core/src/com/arsdigita/util/servlet/HttpParameterListener.java index 10be1a32a..65096d421 100755 --- a/ccm-core/src/com/arsdigita/util/servlet/HttpParameterListener.java +++ b/ccm-core/src/com/arsdigita/util/servlet/HttpParameterListener.java @@ -25,10 +25,7 @@ import javax.servlet.http.HttpServletRequest; * @version $Id: HttpParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface HttpParameterListener { - static final String versionId = - "$Id: HttpParameterListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; void run(HttpServletRequest sreq, HttpParameterMap map); + } diff --git a/ccm-core/src/com/arsdigita/util/servlet/HttpParameterMap.java b/ccm-core/src/com/arsdigita/util/servlet/HttpParameterMap.java index 705afffc7..4eabc9cfd 100755 --- a/ccm-core/src/com/arsdigita/util/servlet/HttpParameterMap.java +++ b/ccm-core/src/com/arsdigita/util/servlet/HttpParameterMap.java @@ -39,10 +39,6 @@ import org.apache.log4j.Logger; * @version $Id: HttpParameterMap.java 738 2005-09-01 12:36:52Z sskracic $ */ public class HttpParameterMap { - public static final String versionId = - "$Id: HttpParameterMap.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (HttpParameterMap.class); diff --git a/ccm-core/src/com/arsdigita/util/servlet/HttpResourceLocator.java b/ccm-core/src/com/arsdigita/util/servlet/HttpResourceLocator.java index a1d0d8e29..8daf1fea0 100755 --- a/ccm-core/src/com/arsdigita/util/servlet/HttpResourceLocator.java +++ b/ccm-core/src/com/arsdigita/util/servlet/HttpResourceLocator.java @@ -125,10 +125,6 @@ import org.apache.log4j.Logger; * @version $Id: HttpResourceLocator.java 287 2005-02-22 00:29:02Z sskracic $ */ public class HttpResourceLocator { - public static final String versionId = - "$Id: HttpResourceLocator.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (HttpResourceLocator.class); diff --git a/ccm-core/src/com/arsdigita/versioning/Difference.java b/ccm-core/src/com/arsdigita/versioning/Difference.java index 286f0e2a2..6bacffe42 100755 --- a/ccm-core/src/com/arsdigita/versioning/Difference.java +++ b/ccm-core/src/com/arsdigita/versioning/Difference.java @@ -33,13 +33,11 @@ import java.util.Map; * Difference * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: Difference.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Difference { - public final static String versionId = "$Id: Difference.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final String[] STATES = {"Created", "Modified", "Deleted"}; private static final int CREATED = 0; diff --git a/ccm-core/src/com/arsdigita/versioning/Operation.java b/ccm-core/src/com/arsdigita/versioning/Operation.java index efad89c2d..5cccb93aa 100755 --- a/ccm-core/src/com/arsdigita/versioning/Operation.java +++ b/ccm-core/src/com/arsdigita/versioning/Operation.java @@ -25,13 +25,11 @@ import com.arsdigita.persistence.metadata.Property; * Operation * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #16 $ $Date: 2004/08/16 $ + * @version $Id: Operation.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Operation { - public final static String versionId = "$Id: Operation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static interface Switch { void onCreate(); diff --git a/ccm-core/src/com/arsdigita/versioning/Tag.java b/ccm-core/src/com/arsdigita/versioning/Tag.java index 12582fa54..ba9ff4254 100755 --- a/ccm-core/src/com/arsdigita/versioning/Tag.java +++ b/ccm-core/src/com/arsdigita/versioning/Tag.java @@ -26,13 +26,11 @@ import com.arsdigita.persistence.OID; * Tag * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Tag.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Tag { - public final static String versionId = "$Id: Tag.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private OID m_oid; private String m_desc; diff --git a/ccm-core/src/com/arsdigita/versioning/TagCollection.java b/ccm-core/src/com/arsdigita/versioning/TagCollection.java index 51e8f3a84..b81c54053 100755 --- a/ccm-core/src/com/arsdigita/versioning/TagCollection.java +++ b/ccm-core/src/com/arsdigita/versioning/TagCollection.java @@ -28,13 +28,11 @@ import com.arsdigita.persistence.OID; * TagCollection * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: TagCollection.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class TagCollection extends DomainQuery { - public final static String versionId = "$Id: TagCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - static final String TAGGED = "taggedOID"; static final String DESC = "tag"; diff --git a/ccm-core/src/com/arsdigita/versioning/Versioning.java b/ccm-core/src/com/arsdigita/versioning/Versioning.java index b35883263..26b7766b9 100755 --- a/ccm-core/src/com/arsdigita/versioning/Versioning.java +++ b/ccm-core/src/com/arsdigita/versioning/Versioning.java @@ -24,15 +24,12 @@ import org.apache.log4j.Logger; /** * An entry point for the services of the versioning package. + * @see com.arsdigita.versioning.VersioningConfig * * @author Justin Ross - * @see com.arsdigita.versioning.VersioningConfig + * @version $Id: Versioning.java 287 2005-02-22 00:29:02Z sskracic $ */ final class Versioning { - public static final String versionId = - "$Id: Versioning.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Versioning.class); diff --git a/ccm-core/src/com/arsdigita/versioning/VersioningConfig.java b/ccm-core/src/com/arsdigita/versioning/VersioningConfig.java index 290c48d34..60887d825 100755 --- a/ccm-core/src/com/arsdigita/versioning/VersioningConfig.java +++ b/ccm-core/src/com/arsdigita/versioning/VersioningConfig.java @@ -32,14 +32,10 @@ import org.apache.log4j.Logger; * parameters with the superclass. * * @author Justin Ross - * * Modified: Peter Boy pboy@barkhof.uni-bremen.de + * @version $Id: VersioningConfig.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class VersioningConfig extends AbstractConfig { - public static final String versionId = - "$Id: VersioningConfig.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(VersioningConfig.class); diff --git a/ccm-core/src/com/arsdigita/web/Application.java b/ccm-core/src/com/arsdigita/web/Application.java index a6f78e417..f43956f10 100755 --- a/ccm-core/src/com/arsdigita/web/Application.java +++ b/ccm-core/src/com/arsdigita/web/Application.java @@ -73,10 +73,6 @@ import org.apache.log4j.Logger; * @version $Id: Application.java 1520 2007-03-22 13:36:04Z chrisgilbert23 $ */ public class Application extends Resource { - public static final String versionId = - "$Id: Application.java 1520 2007-03-22 13:36:04Z chrisgilbert23 $" - + "$Author: chrisgilbert23 $" - + "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Application.class); public static final String PRIMARY_URL = "primaryURL"; diff --git a/ccm-core/src/com/arsdigita/web/ApplicationCollection.java b/ccm-core/src/com/arsdigita/web/ApplicationCollection.java index 3f08a319f..63901cf2b 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationCollection.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationCollection.java @@ -36,10 +36,6 @@ import org.apache.log4j.Logger; * @version $Id: ApplicationCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ApplicationCollection extends ACSObjectCollection { - public static final String versionId = - "$Id: ApplicationCollection.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ApplicationCollection.class); diff --git a/ccm-core/src/com/arsdigita/web/ApplicationSetup.java b/ccm-core/src/com/arsdigita/web/ApplicationSetup.java index a67fecd5f..afa7d5bcd 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationSetup.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationSetup.java @@ -62,10 +62,6 @@ import org.apache.log4j.Category; * @version $Id: ApplicationSetup.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ApplicationSetup { - public static final String versionId = - "$Id: ApplicationSetup.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; protected Category m_category; protected String m_title = null; diff --git a/ccm-core/src/com/arsdigita/web/ApplicationTool.java b/ccm-core/src/com/arsdigita/web/ApplicationTool.java index 1d0dc0312..4e77256cd 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationTool.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationTool.java @@ -31,10 +31,6 @@ import org.apache.log4j.Logger; * @version $Id: ApplicationTool.java 738 2005-09-01 12:36:52Z sskracic $ */ public final class ApplicationTool { - public static final String versionId = - "$Id: ApplicationTool.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ApplicationTool.class); diff --git a/ccm-core/src/com/arsdigita/web/ApplicationTypeCollection.java b/ccm-core/src/com/arsdigita/web/ApplicationTypeCollection.java index 60cd348f1..5543a1b67 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationTypeCollection.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationTypeCollection.java @@ -37,10 +37,6 @@ import org.apache.log4j.Logger; * @version $Id: ApplicationTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ApplicationTypeCollection extends ResourceTypeCollection { - public static final String versionId = - "$Id: ApplicationTypeCollection.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (ApplicationTypeCollection.class); diff --git a/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java b/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java index c13618ed8..8ed6dc3ab 100755 --- a/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java +++ b/ccm-core/src/com/arsdigita/web/BaseApplicationServlet.java @@ -52,13 +52,11 @@ import org.apache.log4j.Logger; * @see com.arsdigita.web.BaseServlet * @see com.arsdigita.web.DispatcherServlet * @see com.arsdigita.web.RedirectSignal + * * @author Justin Ross <jross@redhat.com> + * @version $Id: BaseApplicationServlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class BaseApplicationServlet extends BaseServlet { - public static final String versionId = - "$Id: BaseApplicationServlet.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger (BaseApplicationServlet.class); diff --git a/ccm-core/src/com/arsdigita/web/BaseDispatcher.java b/ccm-core/src/com/arsdigita/web/BaseDispatcher.java index 7837e18c5..73d962f01 100755 --- a/ccm-core/src/com/arsdigita/web/BaseDispatcher.java +++ b/ccm-core/src/com/arsdigita/web/BaseDispatcher.java @@ -48,10 +48,6 @@ import org.apache.log4j.Logger; * @version $Id: BaseDispatcher.java 562 2005-06-12 23:53:19Z apevec $ */ class BaseDispatcher { - public static final String versionId = - "$Id: BaseDispatcher.java 562 2005-06-12 23:53:19Z apevec $" + - "$Author: apevec $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(BaseDispatcher.class); diff --git a/ccm-core/src/com/arsdigita/web/BaseJSP.java b/ccm-core/src/com/arsdigita/web/BaseJSP.java index 4aa4e358b..ab1152cbe 100755 --- a/ccm-core/src/com/arsdigita/web/BaseJSP.java +++ b/ccm-core/src/com/arsdigita/web/BaseJSP.java @@ -42,10 +42,6 @@ import org.apache.log4j.Logger; * @version $Id: BaseJSP.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class BaseJSP extends BaseServlet implements HttpJspPage { - public static final String versionId = - "$Id: BaseJSP.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(BaseJSP.class); diff --git a/ccm-core/src/com/arsdigita/web/CachePolicy.java b/ccm-core/src/com/arsdigita/web/CachePolicy.java index a9f04fd44..05dc7a133 100755 --- a/ccm-core/src/com/arsdigita/web/CachePolicy.java +++ b/ccm-core/src/com/arsdigita/web/CachePolicy.java @@ -30,10 +30,6 @@ import org.apache.log4j.Logger; * @version $Id: CachePolicy.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class CachePolicy { - public static final String versionId = - "$Id: CachePolicy.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(CachePolicy.class); diff --git a/ccm-core/src/com/arsdigita/web/Debugger.java b/ccm-core/src/com/arsdigita/web/Debugger.java index 177c473e2..9d85f0624 100755 --- a/ccm-core/src/com/arsdigita/web/Debugger.java +++ b/ccm-core/src/com/arsdigita/web/Debugger.java @@ -34,12 +34,9 @@ import org.apache.log4j.Logger; * @see TransformationDebugger * * @author Justin Ross + * @version $Id: Debugger.java 287 2005-02-22 00:29:02Z sskracic $ */ public abstract class Debugger { - public static final String versionId = - "$Id: Debugger.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(Debugger.class); diff --git a/ccm-core/src/com/arsdigita/web/DispatcherServlet.java b/ccm-core/src/com/arsdigita/web/DispatcherServlet.java index 1aebf50b2..1fadd7e57 100755 --- a/ccm-core/src/com/arsdigita/web/DispatcherServlet.java +++ b/ccm-core/src/com/arsdigita/web/DispatcherServlet.java @@ -77,10 +77,6 @@ import org.apache.log4j.Logger; * @version $Id: DispatcherServlet.java 738 2005-09-01 12:36:52Z sskracic $ */ public class DispatcherServlet extends BaseServlet { - public static final String versionId = - "$Id: DispatcherServlet.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(DispatcherServlet.class); diff --git a/ccm-core/src/com/arsdigita/web/GlobalizationParameterListener.java b/ccm-core/src/com/arsdigita/web/GlobalizationParameterListener.java index d61bc1a20..827e12c89 100755 --- a/ccm-core/src/com/arsdigita/web/GlobalizationParameterListener.java +++ b/ccm-core/src/com/arsdigita/web/GlobalizationParameterListener.java @@ -33,10 +33,6 @@ import org.apache.log4j.Logger; * @version $Id: GlobalizationParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ */ class GlobalizationParameterListener implements ParameterListener { - public static final String versionId = - "$Id: GlobalizationParameterListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (GlobalizationParameterListener.class); diff --git a/ccm-core/src/com/arsdigita/web/HostLoader.java b/ccm-core/src/com/arsdigita/web/HostLoader.java index cb7b2bfe4..6c146aa0d 100755 --- a/ccm-core/src/com/arsdigita/web/HostLoader.java +++ b/ccm-core/src/com/arsdigita/web/HostLoader.java @@ -43,10 +43,6 @@ import org.apache.log4j.Logger; * @version $Id: HostLoader.java 738 2005-09-01 12:36:52Z sskracic $ */ public final class HostLoader extends AbstractScript { - public static final String versionId = - "$Id: HostLoader.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(HostLoader.class); diff --git a/ccm-core/src/com/arsdigita/web/InternalRequestLocal.java b/ccm-core/src/com/arsdigita/web/InternalRequestLocal.java index 37a66b6e8..488b96786 100755 --- a/ccm-core/src/com/arsdigita/web/InternalRequestLocal.java +++ b/ccm-core/src/com/arsdigita/web/InternalRequestLocal.java @@ -75,10 +75,6 @@ import org.apache.log4j.Logger; * @version $Id: InternalRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $ */ class InternalRequestLocal extends ThreadLocal { - public static final String versionId = - "$Id: InternalRequestLocal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (InternalRequestLocal.class); diff --git a/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java b/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java index 9f89cd153..a3de134c5 100755 --- a/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java +++ b/ccm-core/src/com/arsdigita/web/LegacyAdapterServlet.java @@ -54,15 +54,13 @@ import org.apache.log4j.Logger; * </servlet-mapping> * * - * @author Justin Ross <jross@redhat.com> * @see com.arsdigita.web.DispatcherServlet * @see com.arsdigita.sitenode.SiteNodeDispatcher + * + * @author Justin Ross <jross@redhat.com> + * @version $Id: LegacyAdapterServlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LegacyAdapterServlet extends BaseApplicationServlet { - public static final String versionId = - "$Id: LegacyAdapterServlet.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (LegacyAdapterServlet.class); diff --git a/ccm-core/src/com/arsdigita/web/LegacyInitializerServlet.java b/ccm-core/src/com/arsdigita/web/LegacyInitializerServlet.java index 6f465c3cc..a8ff00b82 100755 --- a/ccm-core/src/com/arsdigita/web/LegacyInitializerServlet.java +++ b/ccm-core/src/com/arsdigita/web/LegacyInitializerServlet.java @@ -26,13 +26,9 @@ import javax.servlet.ServletException; /** * @author Justin Ross <jross@redhat.com> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: LegacyInitializerServlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class LegacyInitializerServlet extends BaseServlet { - public final static String versionId = - "$Id: LegacyInitializerServlet.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private Script m_initializer = null; diff --git a/ccm-core/src/com/arsdigita/web/LoginSignal.java b/ccm-core/src/com/arsdigita/web/LoginSignal.java index 67c181cac..e3a88acbe 100755 --- a/ccm-core/src/com/arsdigita/web/LoginSignal.java +++ b/ccm-core/src/com/arsdigita/web/LoginSignal.java @@ -32,10 +32,6 @@ import org.apache.log4j.Logger; * @version $Id: LoginSignal.java 287 2005-02-22 00:29:02Z sskracic $ */ public class LoginSignal extends RedirectSignal { - public static final String versionId = - "$Id: LoginSignal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(LoginSignal.class); diff --git a/ccm-core/src/com/arsdigita/web/ParameterListener.java b/ccm-core/src/com/arsdigita/web/ParameterListener.java index 016bcaff4..702947246 100755 --- a/ccm-core/src/com/arsdigita/web/ParameterListener.java +++ b/ccm-core/src/com/arsdigita/web/ParameterListener.java @@ -25,10 +25,7 @@ import javax.servlet.http.HttpServletRequest; * @version $Id: ParameterListener.java 287 2005-02-22 00:29:02Z sskracic $ */ public interface ParameterListener { - static final String versionId = - "$Id: ParameterListener.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; void run(HttpServletRequest sreq, ParameterMap map); + } diff --git a/ccm-core/src/com/arsdigita/web/ParameterMap.java b/ccm-core/src/com/arsdigita/web/ParameterMap.java index ef59be8ff..5ff41a676 100755 --- a/ccm-core/src/com/arsdigita/web/ParameterMap.java +++ b/ccm-core/src/com/arsdigita/web/ParameterMap.java @@ -40,10 +40,6 @@ import java.util.Set; * @version $Id: ParameterMap.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ParameterMap implements Cloneable { - public static final String versionId = - "$Id: ParameterMap.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ParameterMap.class); diff --git a/ccm-core/src/com/arsdigita/web/PrefixerServlet.java b/ccm-core/src/com/arsdigita/web/PrefixerServlet.java index 97f2e332e..793c8dc43 100755 --- a/ccm-core/src/com/arsdigita/web/PrefixerServlet.java +++ b/ccm-core/src/com/arsdigita/web/PrefixerServlet.java @@ -34,10 +34,6 @@ import org.apache.log4j.Logger; * @version $Id: PrefixerServlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PrefixerServlet extends HttpServlet { - public static final String versionId = - "$Id: PrefixerServlet.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(PrefixerServlet.class); diff --git a/ccm-core/src/com/arsdigita/web/RedirectSignal.java b/ccm-core/src/com/arsdigita/web/RedirectSignal.java index a6501c1e0..1ba63bd9e 100755 --- a/ccm-core/src/com/arsdigita/web/RedirectSignal.java +++ b/ccm-core/src/com/arsdigita/web/RedirectSignal.java @@ -51,10 +51,6 @@ import org.apache.log4j.Logger; * @version $Id: RedirectSignal.java 287 2005-02-22 00:29:02Z sskracic $ */ public class RedirectSignal extends TransactionSignal { - public static final String versionId = - "$Id: RedirectSignal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(RedirectSignal.class); diff --git a/ccm-core/src/com/arsdigita/web/ReturnSignal.java b/ccm-core/src/com/arsdigita/web/ReturnSignal.java index 6f6158fab..0b93864e3 100755 --- a/ccm-core/src/com/arsdigita/web/ReturnSignal.java +++ b/ccm-core/src/com/arsdigita/web/ReturnSignal.java @@ -31,10 +31,6 @@ import org.apache.log4j.Logger; * @version $Id: ReturnSignal.java 287 2005-02-22 00:29:02Z sskracic $ */ public class ReturnSignal extends RedirectSignal { - public static final String versionId = - "$Id: ReturnSignal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(ReturnSignal.class); diff --git a/ccm-core/src/com/arsdigita/web/TransactionSignal.java b/ccm-core/src/com/arsdigita/web/TransactionSignal.java index e6676e603..85883f363 100755 --- a/ccm-core/src/com/arsdigita/web/TransactionSignal.java +++ b/ccm-core/src/com/arsdigita/web/TransactionSignal.java @@ -32,10 +32,6 @@ import org.apache.log4j.Logger; * @version $Id: TransactionSignal.java 287 2005-02-22 00:29:02Z sskracic $ */ class TransactionSignal extends Error { - public static final String versionId = - "$Id: TransactionSignal.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static Logger s_log = Logger.getLogger(TransactionSignal.class); diff --git a/ccm-core/src/com/arsdigita/web/TransformationDebugger.java b/ccm-core/src/com/arsdigita/web/TransformationDebugger.java index 860300777..c14bb96d0 100755 --- a/ccm-core/src/com/arsdigita/web/TransformationDebugger.java +++ b/ccm-core/src/com/arsdigita/web/TransformationDebugger.java @@ -53,10 +53,6 @@ import org.apache.log4j.Logger; * @version $Id: TransformationDebugger.java 287 2005-02-22 00:29:02Z sskracic $ */ public class TransformationDebugger extends Debugger { - public static final String versionId = - "$Id: TransformationDebugger.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (TransformationDebugger.class); diff --git a/ccm-core/src/com/arsdigita/web/URL.java b/ccm-core/src/com/arsdigita/web/URL.java index dd910971c..558136c12 100755 --- a/ccm-core/src/com/arsdigita/web/URL.java +++ b/ccm-core/src/com/arsdigita/web/URL.java @@ -131,10 +131,6 @@ import org.apache.log4j.Logger; * @version $Id: URL.java 800 2005-09-12 15:11:00Z fabrice $ */ public class URL { - public static final String versionId = - "$Id: URL.java 800 2005-09-12 15:11:00Z fabrice $" + - "$Author: fabrice $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(URL.class); diff --git a/ccm-core/src/com/arsdigita/web/WebApp.java b/ccm-core/src/com/arsdigita/web/WebApp.java index 4abc0557f..9225e72ab 100755 --- a/ccm-core/src/com/arsdigita/web/WebApp.java +++ b/ccm-core/src/com/arsdigita/web/WebApp.java @@ -35,10 +35,6 @@ import org.apache.log4j.Logger; * @version $Id: WebApp.java 738 2005-09-01 12:36:52Z sskracic $ */ public final class WebApp extends DomainObject { - public static final String versionId = - "$Id: WebApp.java 738 2005-09-01 12:36:52Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(WebApp.class); diff --git a/ccm-core/src/com/arsdigita/web/WebConfig.java b/ccm-core/src/com/arsdigita/web/WebConfig.java index 70818c2f5..9ac84106d 100755 --- a/ccm-core/src/com/arsdigita/web/WebConfig.java +++ b/ccm-core/src/com/arsdigita/web/WebConfig.java @@ -47,10 +47,6 @@ import org.apache.log4j.Logger; * @version $Id: WebConfig.java 1548 2007-03-29 14:49:49Z chrisgilbert23 $ */ public final class WebConfig extends AbstractConfig { - public static final String versionId = - "$Id: WebConfig.java 1548 2007-03-29 14:49:49Z chrisgilbert23 $" + - "$Author: chrisgilbert23 $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(WebConfig.class); diff --git a/ccm-core/src/com/arsdigita/web/WebContext.java b/ccm-core/src/com/arsdigita/web/WebContext.java index 11e519eb0..e688a166c 100755 --- a/ccm-core/src/com/arsdigita/web/WebContext.java +++ b/ccm-core/src/com/arsdigita/web/WebContext.java @@ -35,12 +35,9 @@ import org.apache.log4j.Logger; * * @author Rafael Schloming * @author Justin Ross + * @version $Id: WebContext.java 287 2005-02-22 00:29:02Z sskracic $ */ public final class WebContext extends Record { - public static final String versionId = - "$Id: WebContext.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(WebContext.class); diff --git a/ccm-core/src/com/arsdigita/web/WebContextExposer.java b/ccm-core/src/com/arsdigita/web/WebContextExposer.java index a554c18bd..6cf84ebcb 100755 --- a/ccm-core/src/com/arsdigita/web/WebContextExposer.java +++ b/ccm-core/src/com/arsdigita/web/WebContextExposer.java @@ -28,10 +28,6 @@ import org.apache.log4j.Logger; * @version $Id: WebContextExposer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class WebContextExposer { - public static final String versionId = - "$Id: WebContextExposer.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (WebContextExposer.class); diff --git a/ccm-core/src/com/arsdigita/web/WebExposer.java b/ccm-core/src/com/arsdigita/web/WebExposer.java index f2ec38b63..4424fe635 100755 --- a/ccm-core/src/com/arsdigita/web/WebExposer.java +++ b/ccm-core/src/com/arsdigita/web/WebExposer.java @@ -30,10 +30,6 @@ import org.apache.log4j.Logger; * @version $Id: WebExposer.java 287 2005-02-22 00:29:02Z sskracic $ */ public class WebExposer { - public static final String versionId = - "$Id: WebExposer.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger (WebExposer.class); diff --git a/ccm-core/src/com/arsdigita/web/monitoring/DBTestServlet.java b/ccm-core/src/com/arsdigita/web/monitoring/DBTestServlet.java index dfd578147..914fc618b 100755 --- a/ccm-core/src/com/arsdigita/web/monitoring/DBTestServlet.java +++ b/ccm-core/src/com/arsdigita/web/monitoring/DBTestServlet.java @@ -42,11 +42,10 @@ import org.apache.log4j.Logger; * and look at the output * * @author Randy Graebner (randyg@alum.mit.edu) - * @version $Revision: #7 $, $Date: 2004/08/16 $ + * @version $Id: DBTestServlet.java 287 2005-02-22 00:29:02Z sskracic $ */ public class DBTestServlet extends HttpServlet { - public static final String versionId = "$Id: DBTestServlet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(DBTestServlet.class); diff --git a/ccm-core/src/com/arsdigita/workflow/simple/UserTask.java b/ccm-core/src/com/arsdigita/workflow/simple/UserTask.java index 16e6cbba7..56a73b280 100755 --- a/ccm-core/src/com/arsdigita/workflow/simple/UserTask.java +++ b/ccm-core/src/com/arsdigita/workflow/simple/UserTask.java @@ -55,12 +55,9 @@ import org.apache.log4j.Logger; * @author Uday Mathur * @author Khy Huang * @author Stefan Deusch + * @version $Id: UserTask.java 1564 2007-04-18 16:15:27Z apevec $ **/ public class UserTask extends Task implements Assignable { - public static final String versionId = - "$Id: UserTask.java 1564 2007-04-18 16:15:27Z apevec $" + - " by $Author: apevec $, " + - "$DateTime: 2004/08/16 18:10:38 $"; private static WorkflowConfig CONFIG; @@ -279,7 +276,7 @@ public class UserTask extends Task implements Assignable { * Marks the task as finished. (persistent operation) *

This operation is only valid if the * task is enabled. - * Only the user who previously isLocked the task can call this + * Only the user who previously locked the task can call this * method. * * @param user the user who checks off the task @@ -484,7 +481,7 @@ public class UserTask extends Task implements Assignable { /** * Releases the lock on the task if it is currently - * isLocked. (persistent operation) + * locked. (persistent operation) * * @param user the user who is unlocking the task * @@ -497,8 +494,8 @@ public class UserTask extends Task implements Assignable { /** - * Checks whether the task is isLocked by a user. - * @return true if the task is isLocked + * Checks whether the task is locked by a user. + * @return true if the task is locked * by a user; false otherwise. * @@ -509,8 +506,8 @@ public class UserTask extends Task implements Assignable { /** - * Retrieves the user who isLocked the process. - * @return the user who isLocked the process. + * Retrieves the user who locked the process. + * @return the user who locked the process. * */ public User getLockedUser() { diff --git a/ccm-core/src/com/arsdigita/workflow/simple/Workflow.java b/ccm-core/src/com/arsdigita/workflow/simple/Workflow.java index d612e4aca..79d85b93b 100755 --- a/ccm-core/src/com/arsdigita/workflow/simple/Workflow.java +++ b/ccm-core/src/com/arsdigita/workflow/simple/Workflow.java @@ -51,13 +51,10 @@ import org.apache.log4j.Logger; * @author Stefan Deusch * @author Uday Mathur * @author Karl Goldstein + * @version $Id: Workflow.java 1278 2006-07-27 09:09:51Z cgyg9330 $ * **/ public class Workflow extends Task { - public static final String versionId = - "$Id: Workflow.java 1278 2006-07-27 09:09:51Z cgyg9330 $" + - "$Author: cgyg9330 $" + - "$DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.workflow.simple.Workflow"; diff --git a/ccm-core/src/com/arsdigita/workflow/simple/WorkflowConfig.java b/ccm-core/src/com/arsdigita/workflow/simple/WorkflowConfig.java index 412f9d17e..924f5d3b6 100755 --- a/ccm-core/src/com/arsdigita/workflow/simple/WorkflowConfig.java +++ b/ccm-core/src/com/arsdigita/workflow/simple/WorkflowConfig.java @@ -27,16 +27,11 @@ import com.arsdigita.util.parameter.StringParameter; * WorkflowConfig * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: WorkflowConfig.java 287 2005-02-22 00:29:02Z sskracic $ **/ public final class WorkflowConfig extends AbstractConfig { - public final static String versionId = - "$Id: WorkflowConfig.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, " + - "$DateTime: 2004/08/16 18:10:38 $"; - private BooleanParameter m_alerts = new BooleanParameter ("waf.workflow.simple.alerts_enabled", Parameter.OPTIONAL, Boolean.TRUE); diff --git a/ccm-core/src/com/arsdigita/xmlinterp/XMLWalker.java b/ccm-core/src/com/arsdigita/xmlinterp/XMLWalker.java index 8498846b6..8b0c20440 100755 --- a/ccm-core/src/com/arsdigita/xmlinterp/XMLWalker.java +++ b/ccm-core/src/com/arsdigita/xmlinterp/XMLWalker.java @@ -37,13 +37,11 @@ import org.w3c.dom.NodeList; * reduce is executed at the end of a pushed node.

* * @author Bryan Che (bche@redhat.com) - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: XMLWalker.java 287 2005-02-22 00:29:02Z sskracic $ * @since CCM Core 5.2 * */ - public class XMLWalker { - public final static String versionId = "$Id: XMLWalker.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private final String TM = "#"; private boolean trace = false; diff --git a/ccm-core/src/com/redhat/persistence/AddEvent.java b/ccm-core/src/com/redhat/persistence/AddEvent.java index 8ee85a862..2469ed5f3 100755 --- a/ccm-core/src/com/redhat/persistence/AddEvent.java +++ b/ccm-core/src/com/redhat/persistence/AddEvent.java @@ -24,13 +24,11 @@ import com.redhat.persistence.metadata.Property; * AddEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: AddEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class AddEvent extends PropertyEvent { - public final static String versionId = "$Id: AddEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - AddEvent(Session ssn, Object obj, Property prop, Object arg) { this(ssn, obj, prop, arg, null); } diff --git a/ccm-core/src/com/redhat/persistence/ClosedException.java b/ccm-core/src/com/redhat/persistence/ClosedException.java index 050ec1479..cbcab72ca 100755 --- a/ccm-core/src/com/redhat/persistence/ClosedException.java +++ b/ccm-core/src/com/redhat/persistence/ClosedException.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * ClosedException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: ClosedException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ClosedException extends CursorException { - public final static String versionId = "$Id: ClosedException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - ClosedException(Cursor c) { super(c, "cursor closed"); } diff --git a/ccm-core/src/com/redhat/persistence/Condition.java b/ccm-core/src/com/redhat/persistence/Condition.java index 4dcdcb936..ccdfac195 100755 --- a/ccm-core/src/com/redhat/persistence/Condition.java +++ b/ccm-core/src/com/redhat/persistence/Condition.java @@ -24,13 +24,11 @@ import com.redhat.persistence.common.Path; * Condition * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Condition.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class Condition extends Expression { - public final static String versionId = "$Id: Condition.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static abstract class Switch { public abstract void onAnd(And c); diff --git a/ccm-core/src/com/redhat/persistence/CreateEvent.java b/ccm-core/src/com/redhat/persistence/CreateEvent.java index e4c9b8438..4a455abc4 100755 --- a/ccm-core/src/com/redhat/persistence/CreateEvent.java +++ b/ccm-core/src/com/redhat/persistence/CreateEvent.java @@ -26,13 +26,11 @@ import java.util.Iterator; * CreateEvent * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: CreateEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class CreateEvent extends ObjectEvent { - public final static String versionId = "$Id: CreateEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - CreateEvent(Session ssn, Object obj) { super(ssn, obj); } diff --git a/ccm-core/src/com/redhat/persistence/Cursor.java b/ccm-core/src/com/redhat/persistence/Cursor.java index 219f4dd60..7c2fb0f86 100755 --- a/ccm-core/src/com/redhat/persistence/Cursor.java +++ b/ccm-core/src/com/redhat/persistence/Cursor.java @@ -27,13 +27,11 @@ import org.apache.log4j.Logger; * Cursor * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Cursor.java 1393 2006-11-28 09:12:32Z sskracic $ **/ public class Cursor { - public final static String versionId = "$Id: Cursor.java 1393 2006-11-28 09:12:32Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Cursor.class); final private DataSet m_ds; diff --git a/ccm-core/src/com/redhat/persistence/CursorException.java b/ccm-core/src/com/redhat/persistence/CursorException.java index a2ec58497..fc8ea06a2 100755 --- a/ccm-core/src/com/redhat/persistence/CursorException.java +++ b/ccm-core/src/com/redhat/persistence/CursorException.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * CursorException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: CursorException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class CursorException extends ProtoException { - public final static String versionId = "$Id: CursorException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Cursor m_cursor; CursorException(Cursor c, String msg) { diff --git a/ccm-core/src/com/redhat/persistence/DataSet.java b/ccm-core/src/com/redhat/persistence/DataSet.java index 7f760eedb..806096332 100755 --- a/ccm-core/src/com/redhat/persistence/DataSet.java +++ b/ccm-core/src/com/redhat/persistence/DataSet.java @@ -24,13 +24,11 @@ import com.redhat.persistence.oql.Expression; * DataSet * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: DataSet.java 738 2005-09-01 12:36:52Z sskracic $ **/ public class DataSet { - public final static String versionId = "$Id: DataSet.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Session m_ssn; private Signature m_sig; private Expression m_expr; diff --git a/ccm-core/src/com/redhat/persistence/DeleteEvent.java b/ccm-core/src/com/redhat/persistence/DeleteEvent.java index 66a81a426..c7d0a2af9 100755 --- a/ccm-core/src/com/redhat/persistence/DeleteEvent.java +++ b/ccm-core/src/com/redhat/persistence/DeleteEvent.java @@ -26,13 +26,11 @@ import java.util.Iterator; * DeleteEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: DeleteEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class DeleteEvent extends ObjectEvent { - public final static String versionId = "$Id: DeleteEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - DeleteEvent(Session ssn, Object obj) { super(ssn, obj); } diff --git a/ccm-core/src/com/redhat/persistence/Engine.java b/ccm-core/src/com/redhat/persistence/Engine.java index 81cf9b281..8dea7597d 100755 --- a/ccm-core/src/com/redhat/persistence/Engine.java +++ b/ccm-core/src/com/redhat/persistence/Engine.java @@ -26,13 +26,11 @@ import java.util.Map; * Engine * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Engine.java 1045 2005-12-09 13:41:22Z sskracic $ **/ public abstract class Engine { - public final static String versionId = "$Id: Engine.java 1045 2005-12-09 13:41:22Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Session m_ssn; void setSession(Session ssn) { diff --git a/ccm-core/src/com/redhat/persistence/Event.java b/ccm-core/src/com/redhat/persistence/Event.java index c5f463743..5dd2c4be7 100755 --- a/ccm-core/src/com/redhat/persistence/Event.java +++ b/ccm-core/src/com/redhat/persistence/Event.java @@ -29,13 +29,11 @@ import org.apache.log4j.Logger; * Event * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Event.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class Event { - public final static String versionId = "$Id: Event.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(Event.class); public static abstract class Switch { diff --git a/ccm-core/src/com/redhat/persistence/EventProcessor.java b/ccm-core/src/com/redhat/persistence/EventProcessor.java index 12386143e..2fd744dd9 100755 --- a/ccm-core/src/com/redhat/persistence/EventProcessor.java +++ b/ccm-core/src/com/redhat/persistence/EventProcessor.java @@ -23,14 +23,10 @@ package com.redhat.persistence; * * @author Rafael H. Schloming <rhs@mit.edu> * @since 2003-02-20 - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: EventProcessor.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class EventProcessor { - public final static String versionId = - "$Id: EventProcessor.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - /** * During this method, calls into the session to which the event processor * is attached are not allowed. diff --git a/ccm-core/src/com/redhat/persistence/EventStream.java b/ccm-core/src/com/redhat/persistence/EventStream.java index 5976ea2fc..59c5b2b1b 100755 --- a/ccm-core/src/com/redhat/persistence/EventStream.java +++ b/ccm-core/src/com/redhat/persistence/EventStream.java @@ -36,13 +36,11 @@ import java.util.Map; * for filtering the stream down to the set of events that are of interest. * * @author Archit Shah - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: EventStream.java 287 2005-02-22 00:29:02Z sskracic $ **/ class EventStream { - public final static String versionId = "$Id: EventStream.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - // all events private final LinkedList m_events = new LinkedList(); // obj -> current object event diff --git a/ccm-core/src/com/redhat/persistence/Expander.java b/ccm-core/src/com/redhat/persistence/Expander.java index 139ecd47b..7274bafe5 100755 --- a/ccm-core/src/com/redhat/persistence/Expander.java +++ b/ccm-core/src/com/redhat/persistence/Expander.java @@ -36,11 +36,10 @@ import java.util.Map; * it to expand the requested event. The expander prepares the events, but * does not activate any of them. If expansion fails, the session is not left * in an inconsistent state. + * @version $Id: Expander.java 287 2005-02-22 00:29:02Z sskracic $ */ class Expander extends Event.Switch { - public final static String versionId = "$Id: Expander.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - final private Session m_ssn; final private Collection m_deleting = new HashSet(); final private List m_deletes = new LinkedList(); diff --git a/ccm-core/src/com/redhat/persistence/Expression.java b/ccm-core/src/com/redhat/persistence/Expression.java index e5bb6634d..34b7615d9 100755 --- a/ccm-core/src/com/redhat/persistence/Expression.java +++ b/ccm-core/src/com/redhat/persistence/Expression.java @@ -24,13 +24,11 @@ import com.redhat.persistence.common.Path; * Expression * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Expression.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class Expression { - public final static String versionId = "$Id: Expression.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static abstract class Switch { public abstract void onCondition(Condition c); diff --git a/ccm-core/src/com/redhat/persistence/FlushException.java b/ccm-core/src/com/redhat/persistence/FlushException.java index b1e58c2b2..5797e1e96 100755 --- a/ccm-core/src/com/redhat/persistence/FlushException.java +++ b/ccm-core/src/com/redhat/persistence/FlushException.java @@ -28,13 +28,11 @@ import java.util.Iterator; * to flush. * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: FlushException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class FlushException extends ProtoException { - public final static String versionId = "$Id: FlushException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final Object m_obj; private static String msg(Object obj, Collection pds) { diff --git a/ccm-core/src/com/redhat/persistence/NoRowException.java b/ccm-core/src/com/redhat/persistence/NoRowException.java index 2ac1a578e..62154e42e 100755 --- a/ccm-core/src/com/redhat/persistence/NoRowException.java +++ b/ccm-core/src/com/redhat/persistence/NoRowException.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * NoRowException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: NoRowException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class NoRowException extends CursorException { - public final static String versionId = "$Id: NoRowException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - NoRowException(Cursor c) { super(c, "cursor is not currently on a row"); } diff --git a/ccm-core/src/com/redhat/persistence/NoSuchPathException.java b/ccm-core/src/com/redhat/persistence/NoSuchPathException.java index 73e3261ce..2e716d0dc 100755 --- a/ccm-core/src/com/redhat/persistence/NoSuchPathException.java +++ b/ccm-core/src/com/redhat/persistence/NoSuchPathException.java @@ -24,13 +24,11 @@ import com.redhat.persistence.common.Path; * NoSuchPathException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $$Id: NoSuchPathException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class NoSuchPathException extends ProtoException { - public final static String versionId = "$Id: NoSuchPathException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Path m_path; public NoSuchPathException(Path path) { diff --git a/ccm-core/src/com/redhat/persistence/NotFetchedException.java b/ccm-core/src/com/redhat/persistence/NotFetchedException.java index eefd5f63a..507742f5a 100755 --- a/ccm-core/src/com/redhat/persistence/NotFetchedException.java +++ b/ccm-core/src/com/redhat/persistence/NotFetchedException.java @@ -24,13 +24,11 @@ import com.redhat.persistence.common.Path; * NotFetchedException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: NotFetchedException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class NotFetchedException extends CursorException { - public final static String versionId = "$Id: NotFetchedException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Path m_path; public NotFetchedException(Cursor c, Path p) { diff --git a/ccm-core/src/com/redhat/persistence/NullException.java b/ccm-core/src/com/redhat/persistence/NullException.java index 1d6f8fe82..d81c4cb7f 100755 --- a/ccm-core/src/com/redhat/persistence/NullException.java +++ b/ccm-core/src/com/redhat/persistence/NullException.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * NullException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: NullException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class NullException extends ProtoException { - public final static String versionId = "$Id: NullException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Role m_role; NullException(Role role) { diff --git a/ccm-core/src/com/redhat/persistence/ObjectData.java b/ccm-core/src/com/redhat/persistence/ObjectData.java index 381e7a7fb..efdc1fe3d 100755 --- a/ccm-core/src/com/redhat/persistence/ObjectData.java +++ b/ccm-core/src/com/redhat/persistence/ObjectData.java @@ -28,13 +28,11 @@ import org.apache.log4j.Logger; * ObjectData * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: ObjectData.java 287 2005-02-22 00:29:02Z sskracic $ **/ class ObjectData { - public final static String versionId = "$Id: ObjectData.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(ObjectData.class); private final Session m_ssn; diff --git a/ccm-core/src/com/redhat/persistence/ObjectEvent.java b/ccm-core/src/com/redhat/persistence/ObjectEvent.java index f0697f60b..4b623f3d2 100755 --- a/ccm-core/src/com/redhat/persistence/ObjectEvent.java +++ b/ccm-core/src/com/redhat/persistence/ObjectEvent.java @@ -24,13 +24,11 @@ import java.io.PrintWriter; * ObjectEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: ObjectEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class ObjectEvent extends Event { - public final static String versionId = "$Id: ObjectEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ObjectData m_odata; ObjectEvent(Session ssn, Object obj) { diff --git a/ccm-core/src/com/redhat/persistence/Parameter.java b/ccm-core/src/com/redhat/persistence/Parameter.java index 8c796b75c..42a512f34 100755 --- a/ccm-core/src/com/redhat/persistence/Parameter.java +++ b/ccm-core/src/com/redhat/persistence/Parameter.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.ObjectType; * Parameter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Parameter.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Parameter { - public final static String versionId = "$Id: Parameter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ObjectType m_type; private Path m_path; diff --git a/ccm-core/src/com/redhat/persistence/PersistentCollection.java b/ccm-core/src/com/redhat/persistence/PersistentCollection.java index 2554eb225..359462bc6 100755 --- a/ccm-core/src/com/redhat/persistence/PersistentCollection.java +++ b/ccm-core/src/com/redhat/persistence/PersistentCollection.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * PersistentCollection * * @author rhs@mit.edu - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: PersistentCollection.java 287 2005-02-22 00:29:02Z sskracic $ **/ public interface PersistentCollection { - public final static String versionId = "$Id: PersistentCollection.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - Session getSession(); DataSet getDataSet(); diff --git a/ccm-core/src/com/redhat/persistence/PersistentObjectSource.java b/ccm-core/src/com/redhat/persistence/PersistentObjectSource.java index 8babfc089..4b6866d03 100755 --- a/ccm-core/src/com/redhat/persistence/PersistentObjectSource.java +++ b/ccm-core/src/com/redhat/persistence/PersistentObjectSource.java @@ -22,13 +22,11 @@ package com.redhat.persistence; * PersistentObjectSource * * @author rhs@mit.edu - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: PersistentObjectSource.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class PersistentObjectSource { - public final static String versionId = "$Id: PersistentObjectSource.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public PersistentCollection getPersistentCollection(final Session ssn, final DataSet set) { return new PersistentCollection() { diff --git a/ccm-core/src/com/redhat/persistence/PropertyData.java b/ccm-core/src/com/redhat/persistence/PropertyData.java index 36cc89c7f..2b3e842cb 100755 --- a/ccm-core/src/com/redhat/persistence/PropertyData.java +++ b/ccm-core/src/com/redhat/persistence/PropertyData.java @@ -29,13 +29,11 @@ import java.util.List; * PropertyData * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: PropertyData.java 287 2005-02-22 00:29:02Z sskracic $ **/ class PropertyData { - public final static String versionId = "$Id: PropertyData.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - final private ObjectData m_odata; final private Property m_prop; private Object m_value; diff --git a/ccm-core/src/com/redhat/persistence/PropertyEvent.java b/ccm-core/src/com/redhat/persistence/PropertyEvent.java index 8dd7f531f..10f7c8631 100755 --- a/ccm-core/src/com/redhat/persistence/PropertyEvent.java +++ b/ccm-core/src/com/redhat/persistence/PropertyEvent.java @@ -26,13 +26,11 @@ import java.io.PrintWriter; * PropertyEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: PropertyEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class PropertyEvent extends Event { - public final static String versionId = "$Id: PropertyEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - final private Property m_prop; final private Object m_arg; private PropertyData m_pdata; diff --git a/ccm-core/src/com/redhat/persistence/PropertyMap.java b/ccm-core/src/com/redhat/persistence/PropertyMap.java index a1b7139e8..4112681f4 100755 --- a/ccm-core/src/com/redhat/persistence/PropertyMap.java +++ b/ccm-core/src/com/redhat/persistence/PropertyMap.java @@ -29,13 +29,11 @@ import java.util.Set; * PropertyMap * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: PropertyMap.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class PropertyMap { - public final static String versionId = "$Id: PropertyMap.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ObjectType m_type; private HashMap m_values = new HashMap(); diff --git a/ccm-core/src/com/redhat/persistence/QuerySource.java b/ccm-core/src/com/redhat/persistence/QuerySource.java index 0c24cad32..407d177b4 100755 --- a/ccm-core/src/com/redhat/persistence/QuerySource.java +++ b/ccm-core/src/com/redhat/persistence/QuerySource.java @@ -26,13 +26,11 @@ import com.redhat.persistence.oql.Query; * QuerySource * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: QuerySource.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class QuerySource { - public final static String versionId = "$Id: QuerySource.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Session m_ssn = null; void setSession(Session ssn) { diff --git a/ccm-core/src/com/redhat/persistence/RecordSet.java b/ccm-core/src/com/redhat/persistence/RecordSet.java index c52206eb3..d5558a362 100755 --- a/ccm-core/src/com/redhat/persistence/RecordSet.java +++ b/ccm-core/src/com/redhat/persistence/RecordSet.java @@ -33,13 +33,11 @@ import org.apache.log4j.Logger; * RecordSet * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: RecordSet.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class RecordSet { - public final static String versionId = "$Id: RecordSet.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(RecordSet.class); private Signature m_signature; diff --git a/ccm-core/src/com/redhat/persistence/RemoveEvent.java b/ccm-core/src/com/redhat/persistence/RemoveEvent.java index d518add38..2f1005a73 100755 --- a/ccm-core/src/com/redhat/persistence/RemoveEvent.java +++ b/ccm-core/src/com/redhat/persistence/RemoveEvent.java @@ -24,13 +24,11 @@ import com.redhat.persistence.metadata.Property; * RemoveEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: RemoveEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class RemoveEvent extends PropertyEvent { - public final static String versionId = "$Id: RemoveEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - RemoveEvent(Session ssn, Object obj, Property prop, Object arg) { this(ssn, obj, prop, arg, null); } diff --git a/ccm-core/src/com/redhat/persistence/Session.java b/ccm-core/src/com/redhat/persistence/Session.java index 57980a607..2ddfde601 100755 --- a/ccm-core/src/com/redhat/persistence/Session.java +++ b/ccm-core/src/com/redhat/persistence/Session.java @@ -59,13 +59,11 @@ import org.apache.log4j.Logger; * with persistent objects. * * @author rhs@mit.edu - * @version $Revision: #18 $ $Date: 2004/08/16 $ + * @version $Id: Session.java 1393 2006-11-28 09:12:32Z sskracic $ **/ public class Session { - public final static String versionId = "$Id: Session.java 1393 2006-11-28 09:12:32Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - static final Logger LOG = Logger.getLogger(Session.class); private static final PersistentObjectSource POS = diff --git a/ccm-core/src/com/redhat/persistence/SetEvent.java b/ccm-core/src/com/redhat/persistence/SetEvent.java index 3d455c859..ee9ff69d0 100755 --- a/ccm-core/src/com/redhat/persistence/SetEvent.java +++ b/ccm-core/src/com/redhat/persistence/SetEvent.java @@ -24,13 +24,11 @@ import com.redhat.persistence.metadata.Property; * SetEvent * * @author rhs@mit.edu - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: SetEvent.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class SetEvent extends PropertyEvent { - public final static String versionId = "$Id: SetEvent.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_oldValue; SetEvent(Session ssn, Object obj, Property prop, Object arg) { diff --git a/ccm-core/src/com/redhat/persistence/Signature.java b/ccm-core/src/com/redhat/persistence/Signature.java index d5a1ba6ce..60fb9265d 100755 --- a/ccm-core/src/com/redhat/persistence/Signature.java +++ b/ccm-core/src/com/redhat/persistence/Signature.java @@ -35,13 +35,11 @@ import org.apache.log4j.Logger; * Signature * * @author rhs@mit.edu - * @version $Revision: #14 $ $Date: 2004/08/16 $ + * @version $Id: Signature.java 738 2005-09-01 12:36:52Z sskracic $ **/ public class Signature { - public final static String versionId = "$Id: Signature.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(Signature.class); private ArrayList m_paths = new ArrayList(); diff --git a/ccm-core/src/com/redhat/persistence/Source.java b/ccm-core/src/com/redhat/persistence/Source.java index 34e985776..ecdf0a316 100755 --- a/ccm-core/src/com/redhat/persistence/Source.java +++ b/ccm-core/src/com/redhat/persistence/Source.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.ObjectType; * Source * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Source.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Source { - public final static String versionId = "$Id: Source.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ObjectType m_type; private Path m_path; diff --git a/ccm-core/src/com/redhat/persistence/common/CompoundKey.java b/ccm-core/src/com/redhat/persistence/common/CompoundKey.java index f602d7d4a..1049febc5 100755 --- a/ccm-core/src/com/redhat/persistence/common/CompoundKey.java +++ b/ccm-core/src/com/redhat/persistence/common/CompoundKey.java @@ -22,13 +22,11 @@ package com.redhat.persistence.common; * CompoundKey * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: CompoundKey.java 287 2005-02-22 00:29:02Z sskracic $ **/ public final class CompoundKey { - public final static String versionId = "$Id: CompoundKey.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Object m_one; private Object m_two; diff --git a/ccm-core/src/com/redhat/persistence/common/Path.java b/ccm-core/src/com/redhat/persistence/common/Path.java index a06b5792c..8b2d7e149 100755 --- a/ccm-core/src/com/redhat/persistence/common/Path.java +++ b/ccm-core/src/com/redhat/persistence/common/Path.java @@ -24,13 +24,11 @@ import com.arsdigita.util.ConcurrentDict; * Path * * @author rhs@mit.edu - * @version $Revision: #15 $ $Date: 2004/08/16 $ + * @version $Id: Path.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class Path { - public final static String versionId = "$Id: Path.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - //special case the id path since it shows up so often private static final Path ID_PATH = new Path("id"); private static final int NO_DOT = -1; diff --git a/ccm-core/src/com/redhat/persistence/common/SQL.java b/ccm-core/src/com/redhat/persistence/common/SQL.java index c4fa4ea46..0b8a0924c 100755 --- a/ccm-core/src/com/redhat/persistence/common/SQL.java +++ b/ccm-core/src/com/redhat/persistence/common/SQL.java @@ -25,13 +25,11 @@ import java.util.List; * SQL * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: SQL.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class SQL { - public final static String versionId = "$Id: SQL.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private SQLToken m_first; private SQLToken m_last; diff --git a/ccm-core/src/com/redhat/persistence/common/SQLToken.java b/ccm-core/src/com/redhat/persistence/common/SQLToken.java index 1247340cc..8d39e931c 100755 --- a/ccm-core/src/com/redhat/persistence/common/SQLToken.java +++ b/ccm-core/src/com/redhat/persistence/common/SQLToken.java @@ -22,13 +22,10 @@ package com.redhat.persistence.common; * SQLToken * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: SQLToken.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class SQLToken { - public final static String versionId = "$Id: SQLToken.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static class Type { private String m_name; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Aggregator.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Aggregator.java index ca32c68d2..897197f00 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Aggregator.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Aggregator.java @@ -39,13 +39,11 @@ import org.apache.log4j.Logger; * Aggregator * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Aggregator.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Aggregator extends Event.Switch { - public final static String versionId = "$Id: Aggregator.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(Aggregator.class); private static class EventMap extends HashMap { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/CompoundJoin.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/CompoundJoin.java index 5003f1058..2e31d02e2 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/CompoundJoin.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/CompoundJoin.java @@ -24,13 +24,11 @@ import com.redhat.persistence.Condition; * CompoundJoin * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: CompoundJoin.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class CompoundJoin extends Join { - public final static String versionId = "$Id: CompoundJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static class Type {} public static final Type INNER = new Type() { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/DML.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/DML.java index 83542ba6d..aafa0b47a 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/DML.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/DML.java @@ -28,13 +28,11 @@ import java.util.HashMap; * DML * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: DML.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class DML extends Operation { - public final static String versionId = "$Id: DML.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Table m_table; private HashMap m_bindings = new HashMap(); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Delete.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Delete.java index 19b3168d7..3ffef78b5 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Delete.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Delete.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.Table; * Delete * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Delete.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Delete extends Mutation { - public final static String versionId = "$Id: Delete.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Delete(RDBMSEngine engine, Table table, Condition condition) { super(engine, table, condition); } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Environment.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Environment.java index 25f0b1984..3f19d2ed8 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Environment.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Environment.java @@ -34,13 +34,11 @@ import java.util.HashMap; * Environment * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Environment.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Environment { - public final static String versionId = "$Id: Environment.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private RDBMSEngine m_engine; private ObjectMap m_om; private HashMap m_values = new HashMap(); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/EventSwitch.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/EventSwitch.java index 501de123c..ae5649ede 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/EventSwitch.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/EventSwitch.java @@ -59,13 +59,10 @@ import org.apache.log4j.Logger; * EventSwitch * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: EventSwitch.java 737 2005-09-01 12:27:29Z sskracic $ **/ class EventSwitch extends Event.Switch { - - public final static String versionId = "$Id: EventSwitch.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(EventSwitch.class); private static final Path KEY = Path.get("__key__"); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Insert.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Insert.java index 05a9efe20..f9bad0486 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Insert.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Insert.java @@ -24,13 +24,11 @@ import com.redhat.persistence.metadata.Table; * Insert * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Insert.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Insert extends DML { - public final static String versionId = "$Id: Insert.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Insert(RDBMSEngine engine, Table table) { super(engine, table); } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Join.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Join.java index 28e10f145..3e0b2220b 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Join.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Join.java @@ -22,13 +22,11 @@ package com.redhat.persistence.engine.rdbms; * Join * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: Join.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class Join { - public final static String versionId = "$Id: Join.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - abstract void write(SQLWriter w); public String toString() { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Mutation.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Mutation.java index 50b62fa4f..204b156d4 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Mutation.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Mutation.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.Table; * Mutation * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Mutation.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class Mutation extends DML { - public final static String versionId = "$Id: Mutation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Condition m_condition; public Mutation(RDBMSEngine engine, Table table, Condition condition) { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Node.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Node.java index 9a07c86ee..40c7cc501 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Node.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Node.java @@ -28,13 +28,11 @@ import java.util.Iterator; * Node * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: Node.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Node { - public final static String versionId = "$Id: Node.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private HashSet m_dependencies = new HashSet(); private ArrayList m_events = new ArrayList(); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Operation.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Operation.java index c14694f90..dcc8b0b7b 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Operation.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Operation.java @@ -35,13 +35,11 @@ import org.apache.log4j.Logger; * Operation * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #11 $ $Date: 2004/08/16 $ + * @version $Id: Operation.java 287 2005-02-22 00:29:02Z sskracic $ **/ abstract class Operation { - public final static String versionId = "$Id: Operation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(Operation.class); private RDBMSEngine m_engine; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/OracleWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/OracleWriter.java index e6fc5539f..274c6992e 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/OracleWriter.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/OracleWriter.java @@ -24,13 +24,10 @@ import java.sql.Types; * OracleWriter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: OracleWriter.java 738 2005-09-01 12:36:52Z sskracic $ + */ public class OracleWriter extends ANSIWriter { - public final static String versionId = "$Id: OracleWriter.java 738 2005-09-01 12:36:52Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public void write(Select select) { write(select.getQuery().generate (getEngine().getSession().getRoot(), true)); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java index 833c82ce4..fe7498d95 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/PostgresWriter.java @@ -22,13 +22,9 @@ package com.redhat.persistence.engine.rdbms; * PostgresWriter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ - **/ + * @version $Id: PostgresWriter.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class PostgresWriter extends ANSIWriter { - public final static String versionId = - "$Id: PostgresWriter.java 287 2005-02-22 00:29:02Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java index c4e01be84..3b8f36dd9 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java @@ -63,15 +63,10 @@ import org.apache.log4j.Priority; * RDBMSEngine * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #22 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: RDBMSEngine.java 1327 2006-09-25 08:10:48Z sskracic $ + */ public class RDBMSEngine extends Engine { - public final static String versionId = - "$Id: RDBMSEngine.java 1327 2006-09-25 08:10:48Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(RDBMSEngine.class); public static final String OPTION_WINDOW_SIZE = "option:window_size"; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSException.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSException.java index ba6734f97..f2f898d8a 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSException.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSException.java @@ -24,13 +24,11 @@ import com.redhat.persistence.EngineException; * RDBMSException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: RDBMSException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public abstract class RDBMSException extends EngineException { - public final static String versionId = "$Id: RDBMSException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - protected RDBMSException(String message) { super(message); } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSProfiler.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSProfiler.java index 749be2ceb..60efdc06f 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSProfiler.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSProfiler.java @@ -24,13 +24,11 @@ import java.sql.Connection; * RDBMSProfiler * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: RDBMSProfiler.java 817 2005-09-15 14:25:13Z sskracic $ **/ public interface RDBMSProfiler { - public final static String versionId = "$Id: RDBMSProfiler.java 817 2005-09-15 14:25:13Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - StatementLifecycle getLifecycle(Connection conn, RDBMSStatement stmt); } diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSRecordSet.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSRecordSet.java index 4806d30f6..6a5d46472 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSRecordSet.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSRecordSet.java @@ -32,13 +32,11 @@ import org.apache.log4j.Logger; * RDBMSRecordSet * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #11 $ $Date: 2004/08/16 $ + * @version $Id: RDBMSRecordSet.java 1299 2006-08-29 13:26:32Z sskracic $ **/ class RDBMSRecordSet extends RecordSet { - public final static String versionId = "$Id: RDBMSRecordSet.java 1299 2006-08-29 13:26:32Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(RDBMSRecordSet.class); final private RDBMSEngine m_engine; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSStatement.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSStatement.java index 5014e3f0c..07519288e 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSStatement.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/RDBMSStatement.java @@ -28,13 +28,11 @@ import java.util.Collections; * RDBMSStatement * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: RDBMSStatement.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class RDBMSStatement { - public final static String versionId = "$Id: RDBMSStatement.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private final String m_text; private final ArrayList m_events = new ArrayList(); private Signature m_sig = null; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/ResultCycle.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/ResultCycle.java index 0885a2b9c..29d979cab 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/ResultCycle.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/ResultCycle.java @@ -28,13 +28,11 @@ import org.apache.log4j.Logger; * ResultCycle * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #13 $ $Date: 2004/08/16 $ + * @version $Id: ResultCycle.java 287 2005-02-22 00:29:02Z sskracic $ **/ class ResultCycle { - public final static String versionId = "$Id: ResultCycle.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger LOG = Logger.getLogger(ResultCycle.class); final private RDBMSEngine m_engine; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java index b868fdd28..7c46cc69d 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/SQLWriter.java @@ -48,15 +48,11 @@ import java.util.List; * SQLWriter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #17 $ $Date: 2004/08/16 $ + * @version $Id: SQLWriter.java 735 2005-09-01 06:42:59Z sskracic $ **/ public abstract class SQLWriter { - public final static String versionId = - "$Id: SQLWriter.java 735 2005-09-01 06:42:59Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private RDBMSEngine m_engine; private Operation m_op = null; private StringBuffer m_sql = new StringBuffer(); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java index 453a78363..6b43625d1 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Select.java @@ -26,15 +26,11 @@ import com.redhat.persistence.oql.Query; * Select * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: Select.java 738 2005-09-01 12:36:52Z sskracic $ **/ class Select extends Operation { - public final static String versionId = - "$Id: Select.java 738 2005-09-01 12:36:52Z sskracic $" + - " by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Query m_query; private Signature m_sig ; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/SimpleJoin.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/SimpleJoin.java index 96040e8f4..6832d3061 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/SimpleJoin.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/SimpleJoin.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.Table; * SimpleJoin * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: SimpleJoin.java 287 2005-02-22 00:29:02Z sskracic $ **/ class SimpleJoin extends Join { - public final static String versionId = "$Id: SimpleJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Table m_table; private Path m_alias; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java index 91a8404e5..1824c7461 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java @@ -24,13 +24,11 @@ import java.sql.SQLException; * StatementLifecycle * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: StatementLifecycle.java 737 2005-09-01 12:27:29Z sskracic $ **/ public interface StatementLifecycle { - public final static String versionId = "$Id: StatementLifecycle.java 737 2005-09-01 12:27:29Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - void beginPrepare(); void endPrepare(); void endPrepare(SQLException e); diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticJoin.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticJoin.java index 85b47e2cf..768f6709a 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticJoin.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticJoin.java @@ -24,13 +24,10 @@ import com.redhat.persistence.common.Path; * StaticJoin * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: StaticJoin.java 287 2005-02-22 00:29:02Z sskracic $ + */ class StaticJoin extends Join { - public final static String versionId = "$Id: StaticJoin.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private StaticOperation m_op; private Path m_alias; diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticOperation.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticOperation.java index a43417c57..b9921649a 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticOperation.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/StaticOperation.java @@ -26,13 +26,10 @@ import java.util.Iterator; * StaticOperation * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ - **/ - + * @version $Id: StaticOperation.java 287 2005-02-22 00:29:02Z sskracic $ + */ class StaticOperation extends Operation { - public final static String versionId = "$Id: StaticOperation.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private SQLBlock m_sql; public StaticOperation(RDBMSEngine engine, SQLBlock sql, Environment env) { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/UnboundParameterException.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/UnboundParameterException.java index b340676f4..a8cd37afe 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/UnboundParameterException.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/UnboundParameterException.java @@ -24,13 +24,11 @@ import com.redhat.persistence.common.Path; * UnboundParameterException * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: UnboundParameterException.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class UnboundParameterException extends RDBMSException { - public final static String versionId = "$Id: UnboundParameterException.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Path m_parameter; UnboundParameterException(Path parameter) { diff --git a/ccm-core/src/com/redhat/persistence/engine/rdbms/Update.java b/ccm-core/src/com/redhat/persistence/engine/rdbms/Update.java index 4656274d1..12c0ad2bb 100755 --- a/ccm-core/src/com/redhat/persistence/engine/rdbms/Update.java +++ b/ccm-core/src/com/redhat/persistence/engine/rdbms/Update.java @@ -25,13 +25,11 @@ import com.redhat.persistence.metadata.Table; * Update * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: Update.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Update extends Mutation { - public final static String versionId = "$Id: Update.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Update(RDBMSEngine engine, Table table, Condition condition) { super(engine, table, condition); } diff --git a/ccm-core/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java b/ccm-core/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java index f57b90016..8b1cb7431 100755 --- a/ccm-core/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java +++ b/ccm-core/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java @@ -31,13 +31,11 @@ import java.util.List; * CompoundProfiler * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: CompoundProfiler.java 817 2005-09-15 14:25:13Z sskracic $ **/ public class CompoundProfiler implements RDBMSProfiler { - public final static String versionId = "$Id: CompoundProfiler.java 817 2005-09-15 14:25:13Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private List m_children = new ArrayList(); public CompoundProfiler() {} diff --git a/ccm-core/src/com/redhat/persistence/profiler/rdbms/SQLSummary.java b/ccm-core/src/com/redhat/persistence/profiler/rdbms/SQLSummary.java index c61fb15bd..0ebf28d9c 100755 --- a/ccm-core/src/com/redhat/persistence/profiler/rdbms/SQLSummary.java +++ b/ccm-core/src/com/redhat/persistence/profiler/rdbms/SQLSummary.java @@ -32,13 +32,11 @@ import java.util.HashMap; * SQLSummary * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: SQLSummary.java 287 2005-02-22 00:29:02Z sskracic $ **/ class SQLSummary { - public final static String versionId = "$Id: SQLSummary.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final HashMap SUMMARIES = new HashMap(); public static SQLSummary get(String text) { diff --git a/ccm-core/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java b/ccm-core/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java index fe5c9713f..0dbf0db7e 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java +++ b/ccm-core/test/src/com/arsdigita/persistence/metadata/MetadataxSuite.java @@ -27,10 +27,9 @@ import junit.framework.Test; * MetadataSuite - Suite of tests for persistence.metadata * * @author Jon Orris - * @version $Revision: #12 $ $Date: 2004/08/16 $ + * @version $Id: MetadataxSuite.java 745 2005-09-02 10:50:34Z sskracic $ */ public class MetadataxSuite extends PackageTestSuite { - public final static String versionId = "$Id: MetadataxSuite.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { MetadataxSuite suite = new MetadataxSuite(); diff --git a/ccm-core/test/src/com/arsdigita/persistence/oql/OQLSuite.java b/ccm-core/test/src/com/arsdigita/persistence/oql/OQLSuite.java index f86a33917..aa79b430b 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/oql/OQLSuite.java +++ b/ccm-core/test/src/com/arsdigita/persistence/oql/OQLSuite.java @@ -27,13 +27,11 @@ import junit.framework.Test; * OQLSuite * * @author rhs@mit.edu - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: OQLSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class OQLSuite extends PackageTestSuite { - public final static String versionId = "$Id: OQLSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public OQLSuite() {} public OQLSuite(Class theClass) { diff --git a/ccm-core/test/src/com/arsdigita/persistence/oql/QueryTest.java b/ccm-core/test/src/com/arsdigita/persistence/oql/QueryTest.java index b8b04249d..c0603f6b0 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/oql/QueryTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/oql/QueryTest.java @@ -46,13 +46,11 @@ import org.apache.log4j.Logger; * QueryTest * * @author rhs@mit.edu - * @version $Revision: #27 $ $Date: 2004/08/16 $ + * @version $Id: QueryTest.java 745 2005-09-02 10:50:34Z sskracic $ **/ public class QueryTest extends PersistenceTestCase { - public final static String versionId = "$Id: QueryTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(QueryTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java b/ccm-core/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java index 60af2b883..a8e9b8682 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java @@ -31,13 +31,11 @@ import org.apache.log4j.Logger; * AssociationMetadataTest * * @author ashah@redhat.com - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: AssociationMetadataTest.java 745 2005-09-02 10:50:34Z sskracic $ **/ public class AssociationMetadataTest extends TestCase { - public final static String versionId = "$Id: AssociationMetadataTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static Logger s_log = Logger.getLogger(AssociationMetadataTest.class); diff --git a/ccm-core/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java b/ccm-core/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java index b2612359a..16316bb0b 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/pdl/NameFilterTest.java @@ -30,13 +30,11 @@ import junit.framework.TestCase; * NameFilterTest * * @author ashah@redhat.com - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: NameFilterTest.java 750 2005-09-02 12:38:44Z sskracic $ **/ public class NameFilterTest extends TestCase { - public final static String versionId = "$Id: NameFilterTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public NameFilterTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLSuite.java b/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLSuite.java index a5ac977b2..4ac5e0f5d 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLSuite.java +++ b/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLSuite.java @@ -27,10 +27,9 @@ import junit.framework.Test; * PDLSuite * * @author Jon Orris - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: PDLSuite.java 287 2005-02-22 00:29:02Z sskracic $ */ public class PDLSuite extends PackageTestSuite { - public final static String versionId = "$Id: PDLSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { PDLSuite suite = new PDLSuite(); diff --git a/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLTest.java b/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLTest.java index 8a01534b7..fbbc5f1cd 100755 --- a/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLTest.java +++ b/ccm-core/test/src/com/arsdigita/persistence/pdl/PDLTest.java @@ -35,13 +35,11 @@ import org.apache.log4j.Logger; * PDLTest * * @author rhs@mit.edu - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: PDLTest.java 745 2005-09-02 10:50:34Z sskracic $ */ public class PDLTest extends TestCase { - public final static String versionId = "$Id: PDLTest.java 745 2005-09-02 10:50:34Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static Logger s_log = Logger.getLogger(PDLTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/search/Note.java b/ccm-core/test/src/com/arsdigita/search/Note.java index 73048a0e1..a3d9fd476 100755 --- a/ccm-core/test/src/com/arsdigita/search/Note.java +++ b/ccm-core/test/src/com/arsdigita/search/Note.java @@ -26,13 +26,11 @@ import java.math.BigDecimal; * Note * * @author rhs@mit.edu - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: Note.java 287 2005-02-22 00:29:02Z sskracic $ **/ class Note extends AuditedACSObject { - public final static String versionId = "$Id: Note.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.search.Note"; diff --git a/ccm-core/test/src/com/arsdigita/search/SearchSuite.java b/ccm-core/test/src/com/arsdigita/search/SearchSuite.java index 8936fc2b2..7bad65f55 100755 --- a/ccm-core/test/src/com/arsdigita/search/SearchSuite.java +++ b/ccm-core/test/src/com/arsdigita/search/SearchSuite.java @@ -27,13 +27,11 @@ import junit.framework.Test; * SearchSuite * * @author Daniel Berrange - * @version $Revision: #16 $ $Date: 2004/08/16 $ + * @version $Id: SearchSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class SearchSuite extends PackageTestSuite { - public final static String versionId = "$Id: SearchSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static class TestIndexerType extends IndexerType { TestIndexerType() { super("test", diff --git a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java index 25d4da722..37106e07d 100755 --- a/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java +++ b/ccm-core/test/src/com/arsdigita/search/intermedia/SearchTestChapterH.java @@ -33,10 +33,10 @@ import java.math.BigDecimal; * for related objects. * * @author Jeff Teeters + * @version $Id: SearchTestChapterH.java 746 2005-09-02 10:56:35Z sskracic $ **/ public class SearchTestChapterH extends ACSObject implements SearchIndexHelpCustomize { - public static final String versionId = "$Id: SearchTestChapterH.java 746 2005-09-02 10:56:35Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.search.intermedia.SearchTestChapterH"; diff --git a/ccm-core/test/src/com/arsdigita/search/lucene/LuceneSuite.java b/ccm-core/test/src/com/arsdigita/search/lucene/LuceneSuite.java index 59a47eaac..c5dc53cc2 100755 --- a/ccm-core/test/src/com/arsdigita/search/lucene/LuceneSuite.java +++ b/ccm-core/test/src/com/arsdigita/search/lucene/LuceneSuite.java @@ -31,12 +31,11 @@ import org.apache.log4j.Logger; * LuceneSuite * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: LuceneSuite.java 746 2005-09-02 10:56:35Z sskracic $ **/ public class LuceneSuite extends PackageTestSuite { - public final static String versionId = "$Id: LuceneSuite.java 746 2005-09-02 10:56:35Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(LuceneSuite.class); public LuceneSuite() {} diff --git a/ccm-core/test/src/com/arsdigita/search/lucene/LuceneTest.java b/ccm-core/test/src/com/arsdigita/search/lucene/LuceneTest.java index 55ae76d4a..7395c8214 100755 --- a/ccm-core/test/src/com/arsdigita/search/lucene/LuceneTest.java +++ b/ccm-core/test/src/com/arsdigita/search/lucene/LuceneTest.java @@ -24,12 +24,11 @@ import org.apache.log4j.Logger; * LuceneTest * * @author rhs@mit.edu - * @version $Revision: #5 $ $Date: 2004/08/16 $ + * @version $Id: LuceneTest.java 1708 2008-07-12 03:08:52Z terry $ **/ public class LuceneTest extends LuceneTestCase { - public final static String versionId = "$Id: LuceneTest.java 1708 2008-07-12 03:08:52Z terry $ by $Author: terry $, $DateTime: 2004/08/16 18:10:38 $"; private static final Logger s_log = Logger.getLogger(LuceneTest.class); private static final String NAME = "This is a note."; diff --git a/ccm-core/test/src/com/arsdigita/search/lucene/Note.java b/ccm-core/test/src/com/arsdigita/search/lucene/Note.java index f0a12c3d2..4dcb0210a 100755 --- a/ccm-core/test/src/com/arsdigita/search/lucene/Note.java +++ b/ccm-core/test/src/com/arsdigita/search/lucene/Note.java @@ -27,13 +27,11 @@ import java.math.BigDecimal; * Note * * @author rhs@mit.edu - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: Note.java 741 2005-09-02 10:21:19Z sskracic $ **/ class Note extends ACSObject { - public final static String versionId = "$Id: Note.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.search.lucene.Note"; diff --git a/ccm-core/test/src/com/arsdigita/search/lucene/OtherType.java b/ccm-core/test/src/com/arsdigita/search/lucene/OtherType.java index 9ef9e34b4..26f8ab4f9 100755 --- a/ccm-core/test/src/com/arsdigita/search/lucene/OtherType.java +++ b/ccm-core/test/src/com/arsdigita/search/lucene/OtherType.java @@ -27,10 +27,9 @@ import java.math.BigDecimal; * OtherType * * @author Jon Orris - * + * @version $Id: OtherType.java 746 2005-09-02 10:56:35Z sskracic $ */ public class OtherType extends ACSObject { - public final static String versionId = "$Id: OtherType.java 746 2005-09-02 10:56:35Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static final String BASE_DATA_OBJECT_TYPE = "com.arsdigita.search.lucene.OtherType"; diff --git a/ccm-core/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java b/ccm-core/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java index c6a272142..d39d8cbb5 100755 --- a/ccm-core/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java @@ -48,7 +48,6 @@ import org.apache.log4j.Logger; public class PackageDispatcherCreationCactusTest extends ServletTestCase { - public static final String versionId = "$Id: PackageDispatcherCreationCactusTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; HttpServlet s; RequestContext rctx; diff --git a/ccm-core/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java b/ccm-core/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java index f880ea4ea..f8547281f 100755 --- a/ccm-core/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java @@ -24,7 +24,6 @@ import org.apache.cactus.ServletTestCase; public class PersistenceCactusTest extends ServletTestCase { - public static final String versionId = "$Id: PersistenceCactusTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public PersistenceCactusTest(String theName) { super(theName); } diff --git a/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java b/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java index 79a03d1fa..fec85a34b 100755 --- a/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java +++ b/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java @@ -34,7 +34,6 @@ import org.apache.log4j.Logger; public class SiteNodeDispatcherCactusTest extends ServletTestCase { - public static final String versionId = "$Id: SiteNodeDispatcherCactusTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; HttpServlet s; RequestContext rctx; diff --git a/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeSuite.java b/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeSuite.java index 4d814cf83..a911cc86c 100755 --- a/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeSuite.java +++ b/ccm-core/test/src/com/arsdigita/sitenode/SiteNodeSuite.java @@ -23,7 +23,6 @@ import junit.framework.Test; public class SiteNodeSuite extends PackageTestSuite { - public static final String versionId = "$Id: SiteNodeSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { SiteNodeSuite suite = new SiteNodeSuite(); populateSuite(suite); diff --git a/ccm-core/test/src/com/arsdigita/test/ddl/DDLDiffTest.java b/ccm-core/test/src/com/arsdigita/test/ddl/DDLDiffTest.java index 8a4686e03..707430492 100755 --- a/ccm-core/test/src/com/arsdigita/test/ddl/DDLDiffTest.java +++ b/ccm-core/test/src/com/arsdigita/test/ddl/DDLDiffTest.java @@ -26,13 +26,11 @@ import junit.framework.TestCase; * DDLDiffTest * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: DDLDiffTest.java 750 2005-09-02 12:38:44Z sskracic $ **/ public class DDLDiffTest extends TestCase { - public final static String versionId = "$Id: DDLDiffTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public DDLDiffTest(String name) { super(name); } diff --git a/ccm-core/test/src/com/arsdigita/test/ddl/DDLRegressionSuite.java b/ccm-core/test/src/com/arsdigita/test/ddl/DDLRegressionSuite.java index 8669afbf5..e874fa7de 100755 --- a/ccm-core/test/src/com/arsdigita/test/ddl/DDLRegressionSuite.java +++ b/ccm-core/test/src/com/arsdigita/test/ddl/DDLRegressionSuite.java @@ -27,13 +27,11 @@ import junit.framework.Test; * DDLRegressionSuite * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: DDLRegressionSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class DDLRegressionSuite extends PackageTestSuite { - public final static String versionId = "$Id: DDLRegressionSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public DDLRegressionSuite() {} public DDLRegressionSuite(Class theClass) { diff --git a/ccm-core/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java b/ccm-core/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java index 244d1bb6b..1ea7e8c4a 100755 --- a/ccm-core/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java +++ b/ccm-core/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java @@ -33,13 +33,11 @@ import org.apache.log4j.Logger; * CoreInitializer * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: CoreInitializer.java 750 2005-09-02 12:38:44Z sskracic $ **/ public class CoreInitializer extends CompoundInitializer { - public final static String versionId = "$Id: CoreInitializer.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger (CoreInitializer.class); diff --git a/ccm-core/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java b/ccm-core/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java index 2fd435553..3dab4f7c1 100755 --- a/ccm-core/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java @@ -50,11 +50,10 @@ import junit.framework.TestSuite; * the framework will look here. test.testpath must be the fully qualified path name. * * @author Jon Orris - * @version $Revision: #13 $ $Date: 2004/08/16 $ + * @version $Id: PackageTestSuite.java 1720 2008-07-21 13:59:13Z terry $ */ public class PackageTestSuite extends TestSuite { - public final static String versionId = "$Id: PackageTestSuite.java 1720 2008-07-21 13:59:13Z terry $ by $Author: terry $, $DateTime: 2004/08/16 18:10:38 $"; public PackageTestSuite() { super(); diff --git a/ccm-core/test/src/com/arsdigita/ui/login/LoginSuite.java b/ccm-core/test/src/com/arsdigita/ui/login/LoginSuite.java index 1aa9dc850..6937e6203 100755 --- a/ccm-core/test/src/com/arsdigita/ui/login/LoginSuite.java +++ b/ccm-core/test/src/com/arsdigita/ui/login/LoginSuite.java @@ -27,13 +27,11 @@ import junit.framework.Test; * Subsite UI test suite. * * @author Michael Bryzek - * @version $Revision: #10 $ $Date: 2004/08/16 $ + * @version $Id: LoginSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class LoginSuite extends PackageTestSuite { - public final static String versionId = "$Id: LoginSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Test suite() { LoginSuite suite = new LoginSuite(); populateSuite(suite); diff --git a/ccm-core/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java b/ccm-core/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java index d08722485..636637b21 100755 --- a/ccm-core/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java +++ b/ccm-core/test/src/com/arsdigita/ui/login/UserRegistrationPageTest.java @@ -51,7 +51,6 @@ import org.apache.log4j.Logger; public class UserRegistrationPageTest extends HttpUnitTestCase implements LoginConstants { - public static final String versionId = "$Id: UserRegistrationPageTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private Session m_ssn; private TransactionContext m_txn; diff --git a/ccm-core/test/src/com/arsdigita/util/AssertTest.java b/ccm-core/test/src/com/arsdigita/util/AssertTest.java index 612c6bb0b..762d93471 100755 --- a/ccm-core/test/src/com/arsdigita/util/AssertTest.java +++ b/ccm-core/test/src/com/arsdigita/util/AssertTest.java @@ -20,11 +20,10 @@ package com.arsdigita.util; import junit.framework.TestCase; +/** + * @version $Id: AssertTest.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class AssertTest extends TestCase { - public static final String versionId = - "$Id: AssertTest.java 287 2005-02-22 00:29:02Z sskracic $" + - "$Author: sskracic $" + - "$DateTime: 2004/08/16 18:10:38 $"; public AssertTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/util/DummyRequestContext.java b/ccm-core/test/src/com/arsdigita/util/DummyRequestContext.java index 359651e88..c6f67b73d 100755 --- a/ccm-core/test/src/com/arsdigita/util/DummyRequestContext.java +++ b/ccm-core/test/src/com/arsdigita/util/DummyRequestContext.java @@ -28,13 +28,11 @@ import javax.servlet.http.HttpServletRequest; * Dummy RequestContext object for unit testing of form methods that * include requests in their signatures. * - * @version $Revision: #6 $ $Date: 2004/08/16 $ + * @version $Id: DummyRequestContext.java 750 2005-09-02 12:38:44Z sskracic $ */ public class DummyRequestContext implements RequestContext { - public static final String versionId = "$Id: DummyRequestContext.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private ServletContext m_servletContext; private HttpServletRequest m_request; private boolean m_debugging; diff --git a/ccm-core/test/src/com/arsdigita/util/DummyServletContext.java b/ccm-core/test/src/com/arsdigita/util/DummyServletContext.java index 1eb8caab3..b04d37cf6 100755 --- a/ccm-core/test/src/com/arsdigita/util/DummyServletContext.java +++ b/ccm-core/test/src/com/arsdigita/util/DummyServletContext.java @@ -36,13 +36,11 @@ import org.apache.log4j.Logger; * Dummy ServletContext object for unit testing of form methods that * include requests in their signatures. * - * @version $Revision: #11 $ $Date: 2004/08/16 $ + * @version $Id: DummyServletContext.java 750 2005-09-02 12:38:44Z sskracic $ */ public class DummyServletContext implements ServletContext { - public static final String versionId = "$Id: DummyServletContext.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private HashMap m_attributes = new HashMap(); private HashMap m_dispachers = new HashMap(); private static final Logger s_log = Logger.getLogger(DummyServletContext.class); diff --git a/ccm-core/test/src/com/arsdigita/util/HttpServletDummyRequest.java b/ccm-core/test/src/com/arsdigita/util/HttpServletDummyRequest.java index 02ec778ad..fa3479e4b 100755 --- a/ccm-core/test/src/com/arsdigita/util/HttpServletDummyRequest.java +++ b/ccm-core/test/src/com/arsdigita/util/HttpServletDummyRequest.java @@ -41,7 +41,6 @@ import org.apache.cactus.ServletURL; */ public class HttpServletDummyRequest implements HttpServletRequest { - public static final String versionId = "$Id: HttpServletDummyRequest.java 747 2005-09-02 11:02:24Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private HashMap parameters = new HashMap(); private HashMap attributes = new HashMap(); diff --git a/ccm-core/test/src/com/arsdigita/util/HttpServletDummyResponse.java b/ccm-core/test/src/com/arsdigita/util/HttpServletDummyResponse.java index 2eb328245..d21ba6bb2 100755 --- a/ccm-core/test/src/com/arsdigita/util/HttpServletDummyResponse.java +++ b/ccm-core/test/src/com/arsdigita/util/HttpServletDummyResponse.java @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletResponse; public class HttpServletDummyResponse implements HttpServletResponse { - public static final String versionId = "$Id: HttpServletDummyResponse.java 747 2005-09-02 11:02:24Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private PrintStream m_out; private boolean m_committed; diff --git a/ccm-core/test/src/com/arsdigita/util/URLRewriterTest.java b/ccm-core/test/src/com/arsdigita/util/URLRewriterTest.java index 2bdfd5468..ca507a785 100755 --- a/ccm-core/test/src/com/arsdigita/util/URLRewriterTest.java +++ b/ccm-core/test/src/com/arsdigita/util/URLRewriterTest.java @@ -25,10 +25,12 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import junit.framework.TestCase; +/** + * + * @version $Id: URLRewriterTest.java 747 2005-09-02 11:02:24Z sskracic $ + */ public class URLRewriterTest extends TestCase { - public static final String versionId = "$Id: URLRewriterTest.java 747 2005-09-02 11:02:24Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public URLRewriterTest(String s) { super(s); } diff --git a/ccm-core/test/src/com/arsdigita/util/UtilSuite.java b/ccm-core/test/src/com/arsdigita/util/UtilSuite.java index 2e0c0a505..432386f69 100755 --- a/ccm-core/test/src/com/arsdigita/util/UtilSuite.java +++ b/ccm-core/test/src/com/arsdigita/util/UtilSuite.java @@ -29,12 +29,10 @@ import org.apache.log4j.SimpleLayout; /** * @author Dennis Gregorovic - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: UtilSuite.java 287 2005-02-22 00:29:02Z sskracic $ */ public class UtilSuite extends PackageTestSuite { - public final static String versionId = "$Id: UtilSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static Test suite() { initializeLogging(); UtilSuite suite = new UtilSuite(); diff --git a/ccm-core/test/src/com/arsdigita/util/url/URLTestSuite.java b/ccm-core/test/src/com/arsdigita/util/url/URLTestSuite.java index 15d07c2b0..99dc43e47 100755 --- a/ccm-core/test/src/com/arsdigita/util/url/URLTestSuite.java +++ b/ccm-core/test/src/com/arsdigita/util/url/URLTestSuite.java @@ -25,10 +25,9 @@ import junit.framework.Test; /** * URLTestSuite - * + * @version $Id: URLTestSuite.java 750 2005-09-02 12:38:44Z sskracic $ */ public class URLTestSuite extends PackageTestSuite { - public final static String versionId = "$Id: URLTestSuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public URLTestSuite() { super(); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/EngineTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/EngineTest.java index 8666eb21d..a4d16c432 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/EngineTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/EngineTest.java @@ -34,12 +34,10 @@ import org.apache.log4j.Logger; * The Junit test for Engine class * * Testing each of the methods, which are essentially reports - * + * @version $Id: EngineTest.java 741 2005-09-02 10:21:19Z sskracic $ */ public class EngineTest extends WorkflowTestCase { - public static final String versionId = "$Id: EngineTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(EngineTest.class); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/PersistenceTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/PersistenceTest.java index 945e03684..147b550e3 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/PersistenceTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/PersistenceTest.java @@ -29,10 +29,9 @@ import java.util.Iterator; * * * @author Uday Mathur - * + * @version $Id: PersistenceTest.java 741 2005-09-02 10:21:19Z sskracic $ */ public class PersistenceTest extends BaseTestCase { - public static final String versionId = "$Id: PersistenceTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public PersistenceTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java index 8cc7a68c3..861e0e793 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java @@ -44,7 +44,6 @@ import junit.framework.TestSuite; */ public class TaskDefinitionTest extends WorkflowProcessTestHarness { - public static final String versionId = "$Id: TaskDefinitionTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; // initialize reference material diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/TaskTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/TaskTest.java index 59a0892d8..92b06aa41 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/TaskTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/TaskTest.java @@ -39,7 +39,6 @@ import java.util.Iterator; * */ public class TaskTest extends WorkflowTestCase { - public static final String versionId = "$Id: TaskTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public TaskTest(String name) { super(name); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskDefinitionTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskDefinitionTest.java index ba7a258bb..2181820e6 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskDefinitionTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskDefinitionTest.java @@ -39,12 +39,10 @@ import com.arsdigita.persistence.OID; * * @author Stefan Deusch * @author Khy Huang + * @version $Id: UserTaskDefinitionTest.java 287 2005-02-22 00:29:02Z sskracic $ */ public class UserTaskDefinitionTest extends WorkflowTestCase { - public static final String versionId = "$Id: UserTaskDefinitionTest.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - - // initialize reference material static final String label = "My UserTaskDefinition Label"; static final String description = "My UserTaskDefinition Description"; diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskTest.java index 3236cd95a..79855bf0e 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/UserTaskTest.java @@ -43,11 +43,10 @@ import org.apache.log4j.Logger; * * * @author Stefan Deusch - * + * @version $Id: UserTaskTest.java 741 2005-09-02 10:21:19Z sskracic $ */ public class UserTaskTest extends WorkflowTestCase { - public static final String versionId = "$Id: UserTaskTest.java 741 2005-09-02 10:21:19Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; private static Logger s_cat = Logger.getLogger(UserTaskTest.class.getName()); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java index 549710df5..ad961027a 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java @@ -32,8 +32,6 @@ import org.apache.log4j.Logger; */ public class WorkflowProcess2Test extends WorkflowProcessTestHarness { - public static final String versionId = "$Id: WorkflowProcess2Test.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(WorkflowProcess2Test.class); diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java index c5c1fda5e..a5aa97b23 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java @@ -42,12 +42,10 @@ import java.util.Iterator; * @author Richard Li * @author Stefan Deusch * @author Khy Huang - * + * @version $Id: WorkflowProcessTest.java 750 2005-09-02 12:38:44Z sskracic $ */ public class WorkflowProcessTest extends WorkflowProcessTestHarness { - public static final String versionId = "$Id: WorkflowProcessTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - static int taskDefId; // Arrays for WorkflowProcess Pattern below diff --git a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowSuite.java b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowSuite.java index e20df39b2..3403121e7 100755 --- a/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowSuite.java +++ b/ccm-core/test/src/com/arsdigita/workflow/simple/WorkflowSuite.java @@ -29,9 +29,9 @@ import junit.framework.Test; * * @author Joseph A. Bank (jbank@alum.mit.edu) * @version 1.0 + * @version $Id: WorkflowSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class WorkflowSuite extends PackageTestSuite { - public static final String versionId = "$Id: WorkflowSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public WorkflowSuite() { super(); } diff --git a/ccm-core/test/src/com/arsdigita/xml/ACSJDOMTest.java b/ccm-core/test/src/com/arsdigita/xml/ACSJDOMTest.java index da8cd1cd8..920f3cc05 100755 --- a/ccm-core/test/src/com/arsdigita/xml/ACSJDOMTest.java +++ b/ccm-core/test/src/com/arsdigita/xml/ACSJDOMTest.java @@ -28,10 +28,12 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +/** + * + * @version $Id: ACSJDOMTest.java 750 2005-09-02 12:38:44Z sskracic $ + */ public class ACSJDOMTest extends TestCase { - public static final String versionId = "$Id: ACSJDOMTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public static final String BEBOP_XML_NS = "http://www.arsdigita.com/bebop/1.0"; diff --git a/ccm-core/test/src/com/arsdigita/xml/TagTestElement.java b/ccm-core/test/src/com/arsdigita/xml/TagTestElement.java index ad11752e7..9998c222c 100755 --- a/ccm-core/test/src/com/arsdigita/xml/TagTestElement.java +++ b/ccm-core/test/src/com/arsdigita/xml/TagTestElement.java @@ -21,9 +21,12 @@ package com.arsdigita.xml; // This class exists to expose a protected method to a white box test // for validation. +/** + * + * @version $Id: TagTestElement.java 287 2005-02-22 00:29:02Z sskracic $ + */ public class TagTestElement { - public static final String versionId = "$Id: TagTestElement.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static org.w3c.dom.Element getInternalElementForTesting(Element e) { return e.getInternalElement(); } diff --git a/ccm-core/test/src/com/arsdigita/xml/XmlSuite.java b/ccm-core/test/src/com/arsdigita/xml/XmlSuite.java index 5769f0768..7f2fc729f 100755 --- a/ccm-core/test/src/com/arsdigita/xml/XmlSuite.java +++ b/ccm-core/test/src/com/arsdigita/xml/XmlSuite.java @@ -25,10 +25,9 @@ import junit.framework.Test; /** * @author Jon Orris - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: XmlSuite.java 287 2005-02-22 00:29:02Z sskracic $ */ public class XmlSuite extends PackageTestSuite { - public final static String versionId = "$Id: XmlSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; public static Test suite() { XmlSuite suite = new XmlSuite(); diff --git a/ccm-core/test/src/com/redhat/persistence/ProtoSuite.java b/ccm-core/test/src/com/redhat/persistence/ProtoSuite.java index 79a464c22..ae6e52b2e 100755 --- a/ccm-core/test/src/com/redhat/persistence/ProtoSuite.java +++ b/ccm-core/test/src/com/redhat/persistence/ProtoSuite.java @@ -27,13 +27,11 @@ import junit.framework.Test; * ProtoSuite * * @author rhs@mit.edu - * @version $Revision: #8 $ $Date: 2004/08/16 $ + * @version $Id: ProtoSuite.java 287 2005-02-22 00:29:02Z sskracic $ **/ public class ProtoSuite extends PackageTestSuite { - public final static String versionId = "$Id: ProtoSuite.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public ProtoSuite() {} public ProtoSuite(Class theClass) { diff --git a/ccm-core/test/src/com/redhat/persistence/ProtoTest.java b/ccm-core/test/src/com/redhat/persistence/ProtoTest.java index 5d1e8b14b..d3ff3f756 100755 --- a/ccm-core/test/src/com/redhat/persistence/ProtoTest.java +++ b/ccm-core/test/src/com/redhat/persistence/ProtoTest.java @@ -41,13 +41,11 @@ import junit.framework.TestCase; * ProtoTest * * @author rhs@mit.edu - * @version $Revision: #7 $ $Date: 2004/08/16 $ + * @version $Id: ProtoTest.java 740 2005-09-02 10:13:54Z sskracic $ **/ public class ProtoTest extends TestCase { - public final static String versionId = "$Id: ProtoTest.java 740 2005-09-02 10:13:54Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public ProtoTest(String name) { super(name); diff --git a/ccm-core/test/src/com/redhat/persistence/SessionSuite.java b/ccm-core/test/src/com/redhat/persistence/SessionSuite.java index c568b3295..71b421f0f 100755 --- a/ccm-core/test/src/com/redhat/persistence/SessionSuite.java +++ b/ccm-core/test/src/com/redhat/persistence/SessionSuite.java @@ -42,13 +42,11 @@ import org.apache.log4j.Logger; * SessionSuite * * @author ashah@redhat.com - * @version $Revision: #9 $ $Date: 2004/08/16 $ + * @version $Id: SessionSuite.java 740 2005-09-02 10:13:54Z sskracic $ **/ public class SessionSuite extends PackageTestSuite { - public final static String versionId = "$Id: SessionSuite.java 740 2005-09-02 10:13:54Z sskracic $"; - private static final Logger s_log = Logger.getLogger(SessionSuite.class); // private static class PassthroughEngine extends Engine { diff --git a/ccm-core/test/src/com/redhat/persistence/oql/IdentityAdapter.java b/ccm-core/test/src/com/redhat/persistence/oql/IdentityAdapter.java index 5064cd63d..3321db323 100755 --- a/ccm-core/test/src/com/redhat/persistence/oql/IdentityAdapter.java +++ b/ccm-core/test/src/com/redhat/persistence/oql/IdentityAdapter.java @@ -26,13 +26,11 @@ import com.redhat.persistence.metadata.ObjectType; * IdentityAdapter * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: IdentityAdapter.java 740 2005-09-02 10:13:54Z sskracic $ **/ public class IdentityAdapter extends Adapter { - public final static String versionId = "$Id: IdentityAdapter.java 740 2005-09-02 10:13:54Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public Object getObject(ObjectType basetype, PropertyMap props) { return props; } diff --git a/ccm-core/test/src/com/redhat/persistence/oql/MultiSet.java b/ccm-core/test/src/com/redhat/persistence/oql/MultiSet.java index d88c5eebf..293a535dc 100755 --- a/ccm-core/test/src/com/redhat/persistence/oql/MultiSet.java +++ b/ccm-core/test/src/com/redhat/persistence/oql/MultiSet.java @@ -27,13 +27,11 @@ import java.util.Map; * MultiSet * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: MultiSet.java 740 2005-09-02 10:13:54Z sskracic $ **/ class MultiSet { - public final static String versionId = "$Id: MultiSet.java 740 2005-09-02 10:13:54Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private Map m_entries; MultiSet() { diff --git a/ccm-core/test/src/com/redhat/persistence/oql/QuerySuite.java b/ccm-core/test/src/com/redhat/persistence/oql/QuerySuite.java index b067ccda1..e1aa6ae5f 100755 --- a/ccm-core/test/src/com/redhat/persistence/oql/QuerySuite.java +++ b/ccm-core/test/src/com/redhat/persistence/oql/QuerySuite.java @@ -61,13 +61,11 @@ import org.xml.sax.helpers.DefaultHandler; * QuerySuite * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: QuerySuite.java 750 2005-09-02 12:38:44Z sskracic $ **/ public class QuerySuite extends TestSuite { - public final static String versionId = "$Id: QuerySuite.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - public QuerySuite() {} public QuerySuite(Class theClass) { diff --git a/ccm-core/test/src/com/redhat/persistence/oql/QueryTest.java b/ccm-core/test/src/com/redhat/persistence/oql/QueryTest.java index 0bb075f5c..5717249f8 100755 --- a/ccm-core/test/src/com/redhat/persistence/oql/QueryTest.java +++ b/ccm-core/test/src/com/redhat/persistence/oql/QueryTest.java @@ -40,7 +40,7 @@ import org.apache.log4j.Logger; * QueryTest * * @author Rafael H. Schloming <rhs@mit.edu> - * @version $Revision: #4 $ $Date: 2004/08/16 $ + * @version $Id: QueryTest.java 750 2005-09-02 12:38:44Z sskracic $ **/ public class QueryTest extends TestCase { @@ -51,8 +51,6 @@ public class QueryTest extends TestCase { // being an instance of TestCase. Later versions of ant don't // suffer from this problem. - public final static String versionId = "$Id: QueryTest.java 750 2005-09-02 12:38:44Z sskracic $ by $Author: sskracic $, $DateTime: 2004/08/16 18:10:38 $"; - private static final Logger s_log = Logger.getLogger(QueryTest.class); private QuerySuite m_suite;