r1309 - in xwiki/trunk: . src/main/java/com/xpn/xwiki src/main/java/com/xpn/xwiki/api src/main/java/com/xpn/xwiki/atom src/main/java/com/xpn/xwiki/atom/lifeblog src/main/java/com/xpn/xwiki/cache/impl src/main/java/com/xpn/xwiki/doc src/main/java/com/xpn/xwiki/monitor/api src/main/java/com/xpn/xwiki/notify src/main/java/com/xpn/xwiki/objects src/main/java/com/xpn/xwiki/objects/classes src/main/java/com/xpn/xwiki/objects/meta src/main/java/com/xpn/xwiki/pdf/api src/main/java/com/xpn/xwiki/pdf/impl src/main/java/com/xpn/xwiki/plugin src/main/java/com/xpn/xwiki/plugin/alexa src/main/java/com/xpn/xwiki/plugin/calendar src/main/java/com/xpn/xwiki/plugin/captcha src/main/java/com/xpn/xwiki/plugin/charts src/main/java/com/xpn/xwiki/plugin/charts/actions src/main/java/com/xpn/xwiki/plugin/charts/params src/main/java/com/xpn/xwiki/plugin/charts/plots src/main/java/com/xpn/xwiki/plugin/charts/source src/main/java/com/xpn/xwiki/plugin/charts/wizard src/main/java/com/xpn/xwiki/plugin/feed src/main/java/com/xpn/xwiki/plugin/fileupload src/main/java/com/xpn/xwiki/plugin/flickr src/main/java/com/xpn/xwiki/plugin/google src/main/java/com/xpn/xwiki/plugin/graphviz src/main/java/com/xpn/xwiki/plugin/image src/main/java/com/xpn/xwiki/plugin/ipresolver src/main/java/com/xpn/xwiki/plugin/laszlo src/main/java/com/xpn/xwiki/plugin/ldap src/main/java/com/xpn/xwiki/plugin/mail src/main/java/com/xpn/xwiki/plugin/packaging src/main/java/com/xpn/xwiki/plugin/query src/main/java/com/xpn/xwiki/plugin/svg src/main/java/com/xpn/xwiki/plugin/terraserver src/main/java/com/xpn/xwiki/plugin/test src/main/java/com/xpn/xwiki/plugin/userdirectory src/main/java/com/xpn/xwiki/plugin/usertools src/main/java/com/xpn/xwiki/render src/main/java/com/xpn/xwiki/render/filter src/main/java/com/xpn/xwiki/render/groovy src/main/java/com/xpn/xwiki/render/macro src/main/java/com/xpn/xwiki/render/macro/rss src/main/java/com/xpn/xwiki/stats/api src/main/java/com/xpn/xwiki/stats/impl src/main/java/com/xpn/xwiki/store src/main/java/com/xpn/xwiki/store/jcr src/main/java/com/xpn/xwiki/test/smtp src/main/java/com/xpn/xwiki/user/api src/main/java/com/xpn/xwiki/user/impl/exo src/main/java/com/xpn/xwiki/user/impl/xwiki src/main/java/com/xpn/xwiki/util src/main/java/com/xpn/xwiki/web src/main/java/com/xpn/xwiki/web/includeservletasstring src/main/java/com/xpn/xwiki/xmlrpc src/main/resources src/main/web/WEB-INF src/test/java/com/xpn/xwiki/test src/test/java/com/xpn/xwiki/test/plugin/query src/test/resources
Ludovic Dubost
ludovic at users.forge.objectweb.org
Tue Sep 12 22:04:13 CEST 2006
Author: ludovic
Date: 2006-09-12 22:04:10 +0200 (Tue, 12 Sep 2006)
New Revision: 1309
Modified:
xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java
xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Attachment.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Class.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Collection.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/Object.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java
xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
xwiki/trunk/src/main/java/com/xpn/xwiki/atom/WSSEHttpHeader.java
xwiki/trunk/src/main/java/com/xpn/xwiki/atom/XWikiHelper.java
xwiki/trunk/src/main/java/com/xpn/xwiki/atom/lifeblog/LifeblogServices.java
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/SharedJavaGroupsBroadcastingListener.java
xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/XWikiCacheListener.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorData.java
xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java
xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java
xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseObject.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseProperty.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/DateProperty.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ListProperty.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ObjectInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BooleanClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PasswordClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PropertyClassInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/StaticListClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/StringClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/TextAreaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/UsersClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/BooleanMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/DBListMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/DateMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/GroupsMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/LevelsMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/MetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/NumberMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/PasswordMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/StaticListMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/StringMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/TextAreaMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/objects/meta/UsersMetaClass.java
xwiki/trunk/src/main/java/com/xpn/xwiki/pdf/api/PdfExport.java
xwiki/trunk/src/main/java/com/xpn/xwiki/pdf/impl/PdfExportImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/pdf/impl/PdfURLFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/pdf/impl/XWikiURIResolver.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/PatternPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/TablePlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/XWikiPluginManager.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/alexa/AlexaPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/alexa/AlexaPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarData.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarParams.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/calendar/CalendarPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaParams.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/captcha/CaptchaPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/ChartCustomizer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/ChartingMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/ChartingPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/CustomXWikiRenderingEngine.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/RadeoxHelper.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/actions/ChartWizardAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/actions/ChartingAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/actions/CreateChartAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/actions/GetTablesAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/actions/PreviewChartAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/AbstractChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/ChartParams.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/ChoiceChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/ColorChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/DateChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/DateFormatChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/DateTickUnitChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/DefaultChartParams2.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/FontChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/ListChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/LocaleChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/MapChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/NumberFormatChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/NumberTickUnitChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/Point2DChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/RectangleInsetsChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/RendererClassChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/ShapeChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/StrokeChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/params/TimePeriodClassChartParam.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/AreaPlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/BarPlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/CategoryPlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/LinePlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/PiePlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/PlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/TableXYDatasetFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/TimePlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/TimeSeriesCollectionFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/plots/XYPlotFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/DataSourceFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/DefaultDataSource.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/MainDataSourceFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/ObjectDataSourceFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/ObjectidDataSourceFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/TableDataSource.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/source/TableDataSourceFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/charts/wizard/FontHelper.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/feed/FeedPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/fileupload/FileUploadPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/flickr/FlickrPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/google/AdWordsPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/google/AdWordsPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/google/GooglePlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/google/GooglePluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/graphviz/GraphVizPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/image/ImagePlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/ipresolver/IPResolverPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/ipresolver/IPResolverPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/laszlo/LaszloMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/laszlo/LaszloPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/laszlo/LaszloPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/ldap/LDAPPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/mail/MailPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/mail/MailPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/packaging/DocumentFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/packaging/DocumentInfo.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/packaging/Package.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/packaging/PackageAPI.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/DefaultQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/HibernateQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/IQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/IQueryFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/JcrQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/QueryPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/QueryPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/SecHibernateQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiNamespaceResolver.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/query/XWikiQuery.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/svg/SVGMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/svg/SVGPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/svg/SVGPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/terraserver/TerraServerPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/terraserver/TerraServerPluginApi.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/test/testPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/userdirectory/Group.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/userdirectory/UserDirectoryPlugin.java
xwiki/trunk/src/main/java/com/xpn/xwiki/plugin/usertools/XWikiUserManagementToolsImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/FormattingSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/HeadingSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/ListSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/PreTagSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/WikiNameSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/WikiSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiMacrosMappingRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRadeoxRenderEngine.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRadeoxRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiRenderingEngine.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiVelocityRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiVirtualMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/XWikiWikiBaseRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/MacroFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/filter/XWikiLinkFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/GroovyTemplateEngine.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/groovy/XWikiGroovyRenderer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/AttachMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/DisplayMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/FieldMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/FormMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/ImageMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/LinkMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/MacroRepository.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/TableBuilder.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/TableMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/UseMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/XWikiCodeMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/render/macro/rss/RSSMacro.java
xwiki/trunk/src/main/java/com/xpn/xwiki/stats/api/XWikiStatsService.java
xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStats.java
xwiki/trunk/src/main/java/com/xpn/xwiki/stats/impl/XWikiStatsServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/DBCPConnectionProvider.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiAttachmentStoreInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiBatcherFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiBatcherStats.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiCacheStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateAttachmentStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateBaseStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiHibernateVersioningStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiStoreInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/XWikiVersioningStoreInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/IJcrProvider.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/JackRabbitJCRProvider.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/JcrUtil.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrAttachmentStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrBaseStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrPropertyVersioningStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrSession.java
xwiki/trunk/src/main/java/com/xpn/xwiki/store/jcr/XWikiJcrStore.java
xwiki/trunk/src/main/java/com/xpn/xwiki/test/smtp/SimpleSmtpServer.java
xwiki/trunk/src/main/java/com/xpn/xwiki/test/smtp/SmtpMessage.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/api/XWikiAuthService.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/exo/ExoGroupServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyBasicAuthenticator.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFilterConfig.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyFormAuthenticator.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/MyPersistentLoginManager.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiAuthenticator.java
xwiki/trunk/src/main/java/com/xpn/xwiki/user/impl/xwiki/XWikiGroupServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/util/ExoFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/util/MenuSubstitution.java
xwiki/trunk/src/main/java/com/xpn/xwiki/util/TOCGenerator.java
xwiki/trunk/src/main/java/com/xpn/xwiki/util/Util.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/AdminAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/DotAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/DownloadAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/DownloadRevAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/EditAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/LifeBlogAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/LoginAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/LoginErrorAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/LoginSubmitAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/ObjectAddAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/ObjectAddForm.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/ObjectRemoveAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/PDFAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/PreviewAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/PropUpdateAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/RegisterAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/ResetVersionsAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SVGAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SaveAndContinueAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SetCharacterEncodingFilter.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/SkinAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/StatusAction.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiDefaultURLFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiForm.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiPortletContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiPortletRequest.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiPortletResponse.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiRequestProcessor.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletRequest.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletResponse.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiServletURLFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiURLFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/XWikiURLFactoryServiceImpl.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferOutputStream.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/includeservletasstring/BufferedResponse.java
xwiki/trunk/src/main/java/com/xpn/xwiki/web/includeservletasstring/IncludeServletAsString.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/Attachment.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/BaseRpcHandler.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/Comment.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcHandler.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/ConfluenceRpcInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/InitializableHandler.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/MockXWikiResponse.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/MockXWikiServletContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/Page.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/PageHistorySummary.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/PageSummary.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/RequestInitializableHandler.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/SearchResult.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiRpcHandler.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiRpcInterface.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXMLRPCContext.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXMLRPCRequest.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXMLRPCResponse.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXMLRPCURLFactory.java
xwiki/trunk/src/main/java/com/xpn/xwiki/xmlrpc/XWikiXmlRpcServlet.java
xwiki/trunk/src/main/resources/log4j.properties
xwiki/trunk/src/main/web/WEB-INF/hibernate.cfg.xml
xwiki/trunk/src/main/web/WEB-INF/version.properties
xwiki/trunk/src/main/web/WEB-INF/xwiki.cfg
xwiki/trunk/src/test/java/com/xpn/xwiki/test/ClassesTest.java
xwiki/trunk/src/test/java/com/xpn/xwiki/test/plugin/query/QueryGeneratorTest.java
xwiki/trunk/src/test/resources/hibernate-test.cfg.xml
xwiki/trunk/xwiki.iml
xwiki/trunk/xwiki.iws
xwiki/trunk/xwikibase.iml
Log:
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWiki.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -31,60 +31,6 @@
package com.xpn.xwiki;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.Set;
-import java.util.Vector;
-import java.util.zip.ZipOutputStream;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.net.smtp.SMTPClient;
-import org.apache.commons.net.smtp.SMTPReply;
-import org.apache.ecs.Filter;
-import org.apache.ecs.filter.CharacterFilter;
-import org.apache.ecs.xhtml.textarea;
-import org.apache.velocity.VelocityContext;
-import org.exoplatform.container.PortalContainer;
-import org.exoplatform.container.RootContainer;
-import org.hibernate.HibernateException;
-import org.securityfilter.filter.URLPatternMatcher;
-
import com.xpn.xwiki.api.Api;
import com.xpn.xwiki.api.Document;
import com.xpn.xwiki.api.User;
@@ -96,33 +42,20 @@
import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.doc.XWikiDocumentArchive;
-import com.xpn.xwiki.notify.DocObjectChangedRule;
-import com.xpn.xwiki.notify.PropertyChangedRule;
-import com.xpn.xwiki.notify.XWikiActionRule;
-import com.xpn.xwiki.notify.XWikiDocChangeNotificationInterface;
-import com.xpn.xwiki.notify.XWikiNotificationManager;
-import com.xpn.xwiki.notify.XWikiNotificationRule;
-import com.xpn.xwiki.notify.XWikiPageNotification;
+import com.xpn.xwiki.notify.*;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.PropertyInterface;
import com.xpn.xwiki.objects.classes.*;
import com.xpn.xwiki.objects.meta.MetaClass;
import com.xpn.xwiki.plugin.XWikiPluginInterface;
import com.xpn.xwiki.plugin.XWikiPluginManager;
-import com.xpn.xwiki.plugin.query.XWikiQuery;
-import com.xpn.xwiki.plugin.query.QueryPlugin;
import com.xpn.xwiki.render.XWikiRenderingEngine;
import com.xpn.xwiki.render.XWikiVelocityRenderer;
import com.xpn.xwiki.render.groovy.XWikiGroovyRenderer;
import com.xpn.xwiki.stats.api.XWikiStatsService;
import com.xpn.xwiki.stats.impl.SearchEngineRule;
import com.xpn.xwiki.stats.impl.XWikiStatsServiceImpl;
-import com.xpn.xwiki.store.XWikiAttachmentStoreInterface;
-import com.xpn.xwiki.store.XWikiCacheStore;
-import com.xpn.xwiki.store.XWikiCacheStoreInterface;
-import com.xpn.xwiki.store.XWikiHibernateStore;
-import com.xpn.xwiki.store.XWikiStoreInterface;
-import com.xpn.xwiki.store.XWikiVersioningStoreInterface;
+import com.xpn.xwiki.store.*;
import com.xpn.xwiki.store.jcr.XWikiJcrStore;
import com.xpn.xwiki.user.api.XWikiAuthService;
import com.xpn.xwiki.user.api.XWikiGroupService;
@@ -136,17 +69,45 @@
import com.xpn.xwiki.user.impl.xwiki.XWikiRightServiceImpl;
import com.xpn.xwiki.util.MenuSubstitution;
import com.xpn.xwiki.util.Util;
-import com.xpn.xwiki.web.Utils;
-import com.xpn.xwiki.web.XWikiEngineContext;
-import com.xpn.xwiki.web.XWikiMessageTool;
-import com.xpn.xwiki.web.XWikiRequest;
-import com.xpn.xwiki.web.XWikiServletURLFactory;
-import com.xpn.xwiki.web.XWikiURLFactory;
-import com.xpn.xwiki.web.XWikiURLFactoryService;
-import com.xpn.xwiki.web.XWikiURLFactoryServiceImpl;
+import com.xpn.xwiki.web.*;
import com.xpn.xwiki.web.includeservletasstring.IncludeServletAsString;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.UsernamePasswordCredentials;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.net.smtp.SMTPClient;
+import org.apache.commons.net.smtp.SMTPReply;
+import org.apache.ecs.Filter;
+import org.apache.ecs.filter.CharacterFilter;
+import org.apache.ecs.xhtml.textarea;
+import org.apache.velocity.VelocityContext;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.RootContainer;
+import org.hibernate.HibernateException;
+import org.securityfilter.filter.URLPatternMatcher;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.text.DateFormatSymbols;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.zip.ZipOutputStream;
+
public class XWiki implements XWikiDocChangeNotificationInterface, XWikiInterface {
private static final Log log = LogFactory.getLog(XWiki.class);
@@ -4044,6 +4005,18 @@
}
+ /*
+ public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
+ BaseClass bclass = getDocument(className, context).getxWikiClass();
+ PropertyClass pclass = (PropertyClass) bclass.get(fieldname);
+ if (criteria==null)
+ criteria = new XWikiCriteria();
+ if (pclass==null)
+ return "";
+ else
+ return pclass.displaySearch(fieldname, prefix, criteria, context);
+ }
+
public List search(XWikiQuery query, XWikiContext context) throws XWikiException {
QueryPlugin qp = (QueryPlugin) getPlugin("query", context);
if (qp == null)
@@ -4051,26 +4024,8 @@
return qp.search(query);
}
- public String searchAsTable(XWikiRequest request, String className, XWikiContext context) throws XWikiException {
- XWikiQuery query = new XWikiQuery();
- String columns = request.getParameter("columns");
- query.setDisplayProperties(StringUtils.split(columns, ", "));
- Set properties = getDocument(className, context).getxWikiClass().getPropertyList();
- Iterator propid = properties.iterator();
- while (propid.hasNext()) {
- String propname = (String) propid.next();
- Map map = Util.getObject(request, className + "_" + propname);
- Iterator mapid = map.keySet().iterator();
- while (mapid.hasNext()) {
- String key = (String) mapid.next();
- String[] data = (String[])map.get(key);
- if (data.length==1)
- query.setParam(className + "_" + propname + key, data[0]);
- else
- query.setParam(className + "_" + propname + key, data);
- }
- }
- return searchAsTable(query, context);
+ public XWikiQuery createQueryFromRequest(String className, XWikiContext context) throws XWikiException {
+ return new XWikiQuery(context.getRequest(), className, context);
}
public String searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException {
@@ -4117,7 +4072,7 @@
else {
BaseObject bobj = doc.getObject(pclass.getObject().getName());
rowColumns.add(doc.display(pclass.getName(), "view", bobj, context));
- }
+ }
}
result += StringUtils.join(rowColumns.toArray(), " | ") + "\r\n";
}
@@ -4139,5 +4094,5 @@
}
}
}
-
+ */
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiContext.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -24,23 +24,18 @@
package com.xpn.xwiki;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.xmlrpc.server.XmlRpcServer;
-
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.user.api.XWikiUser;
import com.xpn.xwiki.util.Util;
-import com.xpn.xwiki.web.XWikiEngineContext;
-import com.xpn.xwiki.web.XWikiForm;
-import com.xpn.xwiki.web.XWikiRequest;
-import com.xpn.xwiki.web.XWikiResponse;
-import com.xpn.xwiki.web.XWikiURLFactory;
+import com.xpn.xwiki.web.*;
+import org.apache.xmlrpc.server.XmlRpcServer;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
public class XWikiContext extends Hashtable {
public static final int MODE_SERVLET = 0;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiException.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -27,18 +27,17 @@
// import com.xpn.xwiki.store.XWikiBatcher;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.MessageFormat;
-
-import javax.servlet.ServletException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.velocity.exception.MethodInvocationException;
import org.hibernate.JDBCException;
+import javax.servlet.ServletException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.text.MessageFormat;
+
public class XWikiException extends Exception {
private static final Log log = LogFactory.getLog(XWikiException.class);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiInterface.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiInterface.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/XWikiInterface.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,18 +23,6 @@
package com.xpn.xwiki;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.velocity.VelocityContext;
-import org.hibernate.HibernateException;
-import org.securityfilter.filter.URLPatternMatcher;
-
import com.xpn.xwiki.api.User;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.notify.XWikiNotificationManager;
@@ -50,7 +38,18 @@
import com.xpn.xwiki.user.api.XWikiUser;
import com.xpn.xwiki.web.XWikiEngineContext;
import com.xpn.xwiki.web.XWikiRequest;
+import org.apache.velocity.VelocityContext;
+import org.hibernate.HibernateException;
+import org.securityfilter.filter.URLPatternMatcher;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
public interface XWikiInterface {
void updateDatabase(String appname, XWikiContext context) throws HibernateException, XWikiException;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Attachment.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Attachment.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Attachment.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,16 +23,15 @@
package com.xpn.xwiki.api;
-import java.util.Date;
-import java.util.List;
-
-import org.suigeneris.jrcs.rcs.Archive;
-import org.suigeneris.jrcs.rcs.Version;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiAttachment;
+import org.suigeneris.jrcs.rcs.Archive;
+import org.suigeneris.jrcs.rcs.Version;
+import java.util.Date;
+import java.util.List;
+
public class Attachment extends Api {
private Document doc;
private XWikiAttachment attachment;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Class.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Class.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Class.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -25,15 +25,15 @@
package com.xpn.xwiki.api;
-import java.util.Iterator;
-import java.util.Arrays;
-import java.util.Comparator;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.classes.BaseClass;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+
public class Class extends Collection {
public Class(BaseClass obj, XWikiContext context) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Collection.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Collection.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Collection.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,35 +1,35 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.api;
-import java.util.Iterator;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.PropertyInterface;
+import java.util.Iterator;
+
public abstract class Collection extends Element {
public Collection(BaseCollection collection, XWikiContext context) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Document.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -28,31 +28,24 @@
package com.xpn.xwiki.api;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.suigeneris.jrcs.diff.DifferentiationFailedException;
-import org.suigeneris.jrcs.rcs.Version;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.doc.XWikiAttachment;
import com.xpn.xwiki.doc.XWikiDocument;
-import com.xpn.xwiki.doc.XWikiLock;
import com.xpn.xwiki.doc.XWikiDocumentArchive;
+import com.xpn.xwiki.doc.XWikiLock;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.BaseProperty;
-import com.xpn.xwiki.objects.classes.*;
+import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.stats.impl.DocumentStats;
import com.xpn.xwiki.util.TOCGenerator;
import com.xpn.xwiki.util.Util;
+import org.suigeneris.jrcs.diff.DifferentiationFailedException;
+import org.suigeneris.jrcs.rcs.Version;
+import java.util.*;
+
public class Document extends Api {
private XWikiDocument olddoc;
private XWikiDocument doc;
@@ -492,7 +485,7 @@
return "";
return doc.display(fieldname, mode, obj.getBaseObject(), context);
}
-
+
public String displayForm(String className,String header, String format) {
return doc.displayForm(className, header, format, context);
}
@@ -529,12 +522,6 @@
return doc.displayHidden(pclass.getBasePropertyClass(), prefix, object.getCollection(), context);
}
- public String displaySearch(com.xpn.xwiki.api.PropertyClass pclass, String prefix, Collection object) {
- if ((pclass==null)||(object==null))
- return "";
- return doc.displaySearch(pclass.getBasePropertyClass(), prefix, object.getCollection(), context);
- }
-
public List getIncludedPages() {
return doc.getIncludedPages(context);
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/Object.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/Object.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/Object.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -28,8 +28,6 @@
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.BaseObject;
-import java.lang.*;
-
public class Object extends Collection {
public Object(BaseObject obj, XWikiContext context) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/User.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,13 +23,13 @@
package com.xpn.xwiki.api;
-import java.util.Collection;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.user.api.XWikiGroupService;
import com.xpn.xwiki.user.api.XWikiUser;
+import java.util.Collection;
+
public class User extends Api {
private XWikiUser user;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/api/XWiki.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -43,8 +43,8 @@
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.Object;
import java.util.*;
-import java.lang.Object;
public class XWiki extends Api {
private com.xpn.xwiki.XWiki xwiki;
@@ -1028,5 +1028,27 @@
public String convertUsername(String username) {
return xwiki.convertUsername(username, context);
}
+ /*
+ public String displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria, XWikiContext context) throws XWikiException {
+ return xwiki.displaySearch(fieldname, className, prefix, criteria, context);
+ }
+
+ public List search(XWikiQuery query) throws XWikiException {
+ return xwiki.search(query, context);
+ }
+
+ public XWikiQuery createQueryFromRequest(String className) throws XWikiException {
+ return xwiki.createQueryFromRequest(className, context);
+ }
+
+ public String searchAsTable(XWikiQuery query) throws XWikiException {
+ return xwiki.searchAsTable(query, context);
+ }
+
+ public PropertyClass getPropertyClassFromName(String propPath) {
+ return xwiki.getPropertyClassFromName(propPath, context);
+ }
+ */
+
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/atom/WSSEHttpHeader.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/atom/WSSEHttpHeader.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/atom/WSSEHttpHeader.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,29 +1,32 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author kaaloo
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author kaaloo
+ */
/**
*
*/
package com.xpn.xwiki.atom;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.digest.DigestUtils;
+
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -32,9 +35,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.DigestUtils;
-
/**
* @author Luis
*
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/atom/XWikiHelper.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/atom/XWikiHelper.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/atom/XWikiHelper.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,54 +1,48 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author kaaloo
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author kaaloo
+ * @author sdumitriu
+ */
/**
*
*/
package com.xpn.xwiki.atom;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.atom.lifeblog.UserBlog;
import com.xpn.xwiki.doc.XWikiDocument;
import com.xpn.xwiki.objects.BaseObject;
-import com.xpn.xwiki.web.Utils;
-import com.xpn.xwiki.web.XWikiRequest;
-import com.xpn.xwiki.web.XWikiResponse;
-import com.xpn.xwiki.web.XWikiServletContext;
-import com.xpn.xwiki.web.XWikiServletRequest;
-import com.xpn.xwiki.web.XWikiServletResponse;
+import com.xpn.xwiki.web.*;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author Luis
*
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/atom/lifeblog/LifeblogServices.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/atom/lifeblog/LifeblogServices.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/atom/lifeblog/LifeblogServices.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,29 +1,36 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author kaaloo
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author kaaloo
+ */
/**
*
*/
package com.xpn.xwiki.atom.lifeblog;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.atom.WSSEHttpHeader;
+import com.xpn.xwiki.atom.XWikiHelper;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -31,15 +38,7 @@
import java.util.Iterator;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.atom.WSSEHttpHeader;
-import com.xpn.xwiki.atom.XWikiHelper;
-
-
/**
* @author Luis Arias <luis.arias at xwiki.com>
*
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheCache.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,12 +1,5 @@
package com.xpn.xwiki.cache.impl;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import com.opensymphony.oscache.base.Cache;
import com.opensymphony.oscache.base.CacheEntry;
import com.opensymphony.oscache.base.EntryRefreshPolicy;
@@ -16,7 +9,13 @@
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.cache.api.XWikiCache;
import com.xpn.xwiki.cache.api.XWikiCacheNeedsRefreshException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
/**
* Copyright 2006, XpertNet SARL, and individual contributors as indicated by
* the contributors.txt.
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/OSCacheService.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,21 +1,20 @@
package com.xpn.xwiki.cache.impl;
-import java.io.InputStream;
+import com.xpn.xwiki.XWiki;
+import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.cache.api.XWikiCache;
+import com.xpn.xwiki.cache.api.XWikiCacheService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.io.File;
import java.io.FileInputStream;
+import java.io.InputStream;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.xwiki.XWiki;
-import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.cache.api.XWikiCache;
-import com.xpn.xwiki.cache.api.XWikiCacheService;
-
/*
* Copyright 2006, XpertNet SARL, and individual contributors as indicated
* by the contributors.txt.
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/SharedJavaGroupsBroadcastingListener.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/SharedJavaGroupsBroadcastingListener.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/SharedJavaGroupsBroadcastingListener.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,19 +1,19 @@
package com.xpn.xwiki.cache.impl;
+import com.opensymphony.oscache.base.*;
+import com.opensymphony.oscache.base.events.*;
import com.opensymphony.oscache.plugins.clustersupport.ClusterNotification;
import com.opensymphony.oscache.plugins.clustersupport.JavaGroupsBroadcastingListener;
-import com.opensymphony.oscache.base.*;
-import com.opensymphony.oscache.base.events.*;
-import org.jgroups.blocks.NotificationBus;
-import org.jgroups.Channel;
-import org.jgroups.Address;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jgroups.Address;
+import org.jgroups.Channel;
+import org.jgroups.blocks.NotificationBus;
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
/**
* <p>A concrete implementation of the {@link com.opensymphony.oscache.plugins.clustersupport.AbstractBroadcastingListener} based on
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/XWikiCacheListener.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/XWikiCacheListener.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/cache/impl/XWikiCacheListener.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,16 +1,11 @@
package com.xpn.xwiki.cache.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.opensymphony.oscache.base.events.CacheEntryEvent;
-import com.opensymphony.oscache.base.events.CacheEntryEventListener;
-import com.opensymphony.oscache.base.events.CacheGroupEvent;
-import com.opensymphony.oscache.base.events.CachePatternEvent;
-import com.opensymphony.oscache.base.events.CachewideEvent;
+import com.opensymphony.oscache.base.events.*;
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.doc.XWikiDocument;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/*
* Copyright 2006, XpertNet SARL, and individual contributors as indicated
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachment.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -24,29 +24,28 @@
package com.xpn.xwiki.doc;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.io.StringWriter;
-import java.io.IOException;
-import java.io.StringReader;
-
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
import org.apache.commons.codec.binary.Base64;
-import org.suigeneris.jrcs.rcs.Archive;
-import org.suigeneris.jrcs.rcs.Node;
-import org.suigeneris.jrcs.rcs.Version;
-import org.dom4j.Element;
-import org.dom4j.Document ;
+import org.dom4j.Document;
import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.dom.DOMDocument;
+import org.dom4j.dom.DOMElement;
import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
import org.dom4j.io.SAXReader;
-import org.dom4j.dom.DOMElement;
-import org.dom4j.dom.DOMDocument;
+import org.dom4j.io.XMLWriter;
import org.hibernate.ObjectNotFoundException;
+import org.suigeneris.jrcs.rcs.Archive;
+import org.suigeneris.jrcs.rcs.Node;
+import org.suigeneris.jrcs.rcs.Version;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
public class XWikiAttachment {
private XWikiDocument doc;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiAttachmentArchive.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -22,15 +22,13 @@
package com.xpn.xwiki.doc;
-import java.io.ByteArrayInputStream;
-import java.util.Date;
-
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
import org.suigeneris.jrcs.rcs.Archive;
import org.suigeneris.jrcs.util.ToString;
-import org.apache.commons.codec.binary.Base64;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
+import java.io.ByteArrayInputStream;
+import java.util.Date;
public class XWikiAttachmentArchive {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -37,6 +37,7 @@
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.objects.classes.PropertyClass;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
import com.xpn.xwiki.render.XWikiVelocityRenderer;
import com.xpn.xwiki.store.XWikiAttachmentStoreInterface;
import com.xpn.xwiki.store.XWikiStoreInterface;
@@ -71,9 +72,7 @@
import java.io.StringReader;
import java.io.StringWriter;
import java.lang.ref.SoftReference;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -912,7 +911,8 @@
result.append("{/pre}");
} else if (type.equals("search")) {
result.append("{pre}");
- pclass.displaySearch(result, fieldname, prefix, obj, context);
+ prefix = obj.getxWikiClass(context).getName() + "_";
+ pclass.displaySearch(result, fieldname, prefix, (XWikiCriteria) context.get("query"), context);
result.append("{/pre}");
} else {
pclass.displayView(result, fieldname, prefix, obj, context);
@@ -1906,8 +1906,8 @@
return (pclass == null) ? "" : pclass.displayHidden(pclass.getName(), prefix, object, context);
}
- public String displaySearch(PropertyClass pclass, String prefix, BaseCollection object, XWikiContext context) {
- return (pclass == null) ? "" : pclass.displaySearch(pclass.getName(), prefix, object, context);
+ public String displaySearch(PropertyClass pclass, String prefix, XWikiCriteria criteria, XWikiContext context) {
+ return (pclass == null) ? "" : pclass.displaySearch(pclass.getName(), prefix, criteria, context);
}
public XWikiAttachment getAttachment(String filename) {
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,9 +1,9 @@
package com.xpn.xwiki.doc;
+import com.xpn.xwiki.XWikiException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tools.ant.filters.StringInputStream;
-import com.xpn.xwiki.XWikiException;
import org.suigeneris.jrcs.rcs.Archive;
import org.suigeneris.jrcs.util.ToString;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorData.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorData.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorData.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,38 +1,33 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.monitor.api;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.net.URL;
+import java.util.*;
+
public class MonitorData {
private static final Log log = LogFactory.getLog(MonitorData.class);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorPlugin.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorPlugin.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/monitor/api/MonitorPlugin.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -22,18 +22,17 @@
package com.xpn.xwiki.monitor.api;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.plugin.XWikiDefaultPlugin;
+import org.apache.commons.collections.buffer.CircularFifoBuffer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.collections.buffer.CircularFifoBuffer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.plugin.XWikiDefaultPlugin;
-
public class MonitorPlugin extends XWikiDefaultPlugin {
private static final Log log = LogFactory.getLog(MonitorPlugin.class);
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/notify/DocObjectChangedRule.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -22,13 +22,13 @@
package com.xpn.xwiki.notify;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.doc.XWikiDocument;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.doc.XWikiDocument;
-
public class DocObjectChangedRule extends DocChangeRule {
private String className;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiNotificationManager.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -22,13 +22,13 @@
package com.xpn.xwiki.notify;
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.doc.XWikiDocument;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Vector;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.doc.XWikiDocument;
-
public class XWikiNotificationManager {
private Vector generalrules = new Vector();
private Map namedrules = new HashMap();
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/notify/XWikiPageNotification.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,9 +1,9 @@
package com.xpn.xwiki.notify;
-import com.xpn.xwiki.doc.XWikiDocument;
+import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.doc.XWikiDocument;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseCollection.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseCollection.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseCollection.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -25,19 +25,10 @@
package com.xpn.xwiki.objects;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.objects.classes.BaseClass;
+import com.xpn.xwiki.objects.classes.PropertyClass;
import org.apache.commons.collections.map.ListOrderedMap;
import org.dom4j.Document;
import org.dom4j.Element;
@@ -45,11 +36,10 @@
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.doc.XWikiDocument;
-import com.xpn.xwiki.objects.classes.BaseClass;
-import com.xpn.xwiki.objects.classes.PropertyClass;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.util.*;
public abstract class BaseCollection extends BaseElement implements ObjectInterface, Serializable {
protected String className;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseObject.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseObject.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseObject.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -25,19 +25,18 @@
package com.xpn.xwiki.objects;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.dom4j.Element;
-import org.dom4j.dom.DOMElement;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.objects.classes.BaseClass;
import com.xpn.xwiki.objects.classes.PropertyClass;
+import org.dom4j.Element;
+import org.dom4j.dom.DOMElement;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
public class BaseObject extends BaseCollection implements ObjectInterface, Serializable {
public int hashCode() {
@@ -55,10 +54,6 @@
((PropertyClass)getxWikiClass(context).get(name)).displayHidden(buffer, name, prefix, this, context);
}
- public void displaySearch(StringBuffer buffer, String name, String prefix, XWikiContext context) {
- ((PropertyClass)getxWikiClass(context).get(name)).displaySearch(buffer, name, prefix, this, context);
- }
-
public void displayView(StringBuffer buffer, String name, String prefix, XWikiContext context) {
((PropertyClass)getxWikiClass(context).get(name)).displayView(buffer, name, prefix, this, context);
}
@@ -73,12 +68,6 @@
return buffer.toString();
}
- public String displaySearch(String name, String prefix, XWikiContext context) {
- StringBuffer buffer = new StringBuffer();
- ((PropertyClass)getxWikiClass(context).get(name)).displaySearch(buffer, name, prefix, this, context);
- return buffer.toString();
- }
-
public String displayView(String name, String prefix, XWikiContext context) {
StringBuffer buffer = new StringBuffer();
((PropertyClass)getxWikiClass(context).get(name)).displayView(buffer, name, prefix, this, context);
@@ -95,10 +84,6 @@
return displayHidden(name, "", context);
}
- public String displaySearch(String name, XWikiContext context) {
- return displaySearch(name, "", context);
- }
-
public String displayView(String name, XWikiContext context) {
return displayView(name, "", context);
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseProperty.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseProperty.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/BaseProperty.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,31 +1,28 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects;
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.StringWriter;
-
+import com.xpn.xwiki.web.Utils;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.dom.DOMDocument;
@@ -33,7 +30,9 @@
import org.dom4j.io.OutputFormat;
import org.dom4j.io.XMLWriter;
-import com.xpn.xwiki.web.Utils;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.StringWriter;
// TODO: shouldn't this be abstract? toFormString and toText
// will never work unless getValue is overriden
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/DateProperty.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/DateProperty.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/DateProperty.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,34 +1,34 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects;
+import org.dom4j.Element;
+import org.dom4j.dom.DOMElement;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.dom4j.Element;
-import org.dom4j.dom.DOMElement;
-
public class DateProperty extends BaseProperty {
private Date value;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ListProperty.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ListProperty.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ListProperty.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,38 +1,38 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author erwan
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author erwan
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.commons.lang.StringUtils;
import org.apache.ecs.filter.CharacterFilter;
import org.dom4j.Element;
import org.dom4j.dom.DOMElement;
import org.hibernate.collection.PersistentCollection;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
public class ListProperty extends BaseProperty {
protected List list = new ArrayList();
private String formStringSeparator = "|";
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ObjectInterface.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ObjectInterface.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/ObjectInterface.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,32 +1,31 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects;
-import org.dom4j.Element;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
import com.xpn.xwiki.objects.classes.BaseClass;
+import org.dom4j.Element;
public interface ObjectInterface extends ElementInterface {
public BaseClass getxWikiClass(XWikiContext context) throws XWikiException;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BaseClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,31 +23,26 @@
package com.xpn.xwiki.objects.classes;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.io.StringReader;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
-import org.dom4j.Element;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.io.SAXReader;
-import org.dom4j.dom.DOMElement;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.plugin.query.XWikiCriteria;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.objects.BaseObject;
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.PropertyInterface;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.dom.DOMElement;
+import org.dom4j.io.SAXReader;
+import java.io.StringReader;
+import java.util.*;
+
public class BaseClass extends BaseCollection implements ClassInterface {
private static final Log log = LogFactory.getLog(BaseClass.class);
private String customMapping;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BooleanClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BooleanClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/BooleanClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,163 +23,166 @@
package com.xpn.xwiki.objects.classes;
-import org.apache.ecs.xhtml.option;
-import org.apache.ecs.xhtml.select;
-import org.apache.ecs.xhtml.input;
-
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.IntegerProperty;
import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
import com.xpn.xwiki.web.XWikiMessageTool;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.option;
+import org.apache.ecs.xhtml.select;
+import java.util.Map;
+
public class BooleanClass extends PropertyClass {
- public BooleanClass(PropertyMetaClass wclass) {
- super("boolean", "Boolean", wclass);
- }
+ public BooleanClass(PropertyMetaClass wclass) {
+ super("boolean", "Boolean", wclass);
+ }
- public BooleanClass() {
- this(null);
- }
+ public BooleanClass() {
+ this(null);
+ }
- public String getDisplayType() {
- String dtype = getStringValue("displayType");
- if ((dtype == null) || (dtype.equals(""))) {
- return "yesno";
- }
- return dtype;
- }
+ public String getDisplayType() {
+ String dtype = getStringValue("displayType");
+ if ((dtype == null) || (dtype.equals(""))) {
+ return "yesno";
+ }
+ return dtype;
+ }
- public void setDefaultValue(int dvalue) {
- setIntValue("defaultValue", dvalue);
- }
+ public void setDefaultValue(int dvalue) {
+ setIntValue("defaultValue", dvalue);
+ }
- public int getDefaultValue() {
- return getIntValue("defaultValue", -1);
- }
+ public int getDefaultValue() {
+ return getIntValue("defaultValue", -1);
+ }
- public void setDisplayType(String type) {
- setStringValue("displayType", type);
- }
+ public void setDisplayType(String type) {
+ setStringValue("displayType", type);
+ }
- public BaseProperty fromString(String value) {
- BaseProperty property = newProperty();
- Number nvalue = null;
- if ((value != null) && (!value.equals("")))
- nvalue = new Integer(value);
- property.setValue(nvalue);
- return property;
- }
+ public BaseProperty fromString(String value) {
+ BaseProperty property = newProperty();
+ Number nvalue = null;
+ if ((value != null) && (!value.equals("")))
+ nvalue = new Integer(value);
+ property.setValue(nvalue);
+ return property;
+ }
- public BaseProperty newProperty() {
- BaseProperty property = new IntegerProperty();
- property.setName(getName());
- return property;
- }
+ public BaseProperty newProperty() {
+ BaseProperty property = new IntegerProperty();
+ property.setName(getName());
+ return property;
+ }
- public void displayView(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
- IntegerProperty prop = (IntegerProperty) object.safeget(name);
- if (prop == null)
- return;
+ public void displayView(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ IntegerProperty prop = (IntegerProperty) object.safeget(name);
+ if (prop == null)
+ return;
- Integer iValue = (Integer) prop.getValue();
- if (iValue != null) {
- int value = iValue.intValue();
- buffer.append(getDisplayValue(context, value));
- }
- }
+ Integer iValue = (Integer) prop.getValue();
+ if (iValue != null) {
+ int value = iValue.intValue();
+ buffer.append(getDisplayValue(context, value));
+ }
+ }
- public void displayEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
- if (getDisplayType().equals("checkbox")) {
- displayCheckboxEdit(buffer, name, prefix, object, context);
- } else {
- displaySelectEdit(buffer, name, prefix, object, context);
- }
- }
+ public void displayEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ if (getDisplayType().equals("checkbox")) {
+ displayCheckboxEdit(buffer, name, prefix, object, context);
+ } else {
+ displaySelectEdit(buffer, name, prefix, object, context);
+ }
+ }
- public void displaySelectEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
- select select = new select(prefix + name, 1);
- String String0 = getDisplayValue(context, 0);
- String String1 = getDisplayValue(context, 1);
+ public void displaySelectEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ select select = new select(prefix + name, 1);
+ String String0 = getDisplayValue(context, 0);
+ String String1 = getDisplayValue(context, 1);
- option[] options = { new option("---", ""), new option(String1, "1"), new option(String0, "0") };
- options[0].addElement("---");
- options[1].addElement(String1);
- options[2].addElement(String0);
+ option[] options = { new option("---", ""), new option(String1, "1"), new option(String0, "0") };
+ options[0].addElement("---");
+ options[1].addElement(String1);
+ options[2].addElement(String0);
- try {
- IntegerProperty prop = (IntegerProperty) object.safeget(name);
- if (prop != null) {
- Integer ivalue = (Integer) prop.getValue();
- if (ivalue != null) {
- int value = ivalue.intValue();
- if (value == 1)
- options[1].setSelected(true);
- else if (value == 0)
- options[2].setSelected(true);
- } else {
- int value = getDefaultValue();
- if (value == 1)
- options[1].setSelected(true);
- else if (value == 0)
- options[2].setSelected(true);
- }
- }
- } catch (Exception e) {
- // This should not happen
- e.printStackTrace();
- }
- select.addElement(options);
- buffer.append(select.toString());
- }
+ try {
+ IntegerProperty prop = (IntegerProperty) object.safeget(name);
+ if (prop != null) {
+ Integer ivalue = (Integer) prop.getValue();
+ if (ivalue != null) {
+ int value = ivalue.intValue();
+ if (value == 1)
+ options[1].setSelected(true);
+ else if (value == 0)
+ options[2].setSelected(true);
+ } else {
+ int value = getDefaultValue();
+ if (value == 1)
+ options[1].setSelected(true);
+ else if (value == 0)
+ options[2].setSelected(true);
+ }
+ }
+ } catch (Exception e) {
+ // This should not happen
+ e.printStackTrace();
+ }
+ select.addElement(options);
+ buffer.append(select.toString());
+ }
- public void displayCheckboxEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
- org.apache.ecs.xhtml.input check = new input(input.checkbox, prefix + name, 1);
- org.apache.ecs.xhtml.input checkNo = new input(input.hidden, prefix + name, 0);
+ public void displayCheckboxEdit(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ org.apache.ecs.xhtml.input check = new input(input.checkbox, prefix + name, 1);
+ org.apache.ecs.xhtml.input checkNo = new input(input.hidden, prefix + name, 0);
- try {
- IntegerProperty prop = (IntegerProperty) object.safeget(name);
- if (prop != null) {
- Integer ivalue = (Integer) prop.getValue();
- if (ivalue != null) {
- int value = ivalue.intValue();
- if (value == 1)
- check.setChecked(true);
- else if (value == 0)
- check.setChecked(false);
- } else {
- int value = getDefaultValue();
- if (value == 1)
- check.setChecked(true);
- else
- check.setChecked(false);
- }
- }
- } catch (Exception e) {
- // This should not happen
- e.printStackTrace();
- }
- buffer.append(check.toString());
- buffer.append(checkNo.toString());
- }
+ try {
+ IntegerProperty prop = (IntegerProperty) object.safeget(name);
+ if (prop != null) {
+ Integer ivalue = (Integer) prop.getValue();
+ if (ivalue != null) {
+ int value = ivalue.intValue();
+ if (value == 1)
+ check.setChecked(true);
+ else if (value == 0)
+ check.setChecked(false);
+ } else {
+ int value = getDefaultValue();
+ if (value == 1)
+ check.setChecked(true);
+ else
+ check.setChecked(false);
+ }
+ }
+ } catch (Exception e) {
+ // This should not happen
+ e.printStackTrace();
+ }
+ buffer.append(check.toString());
+ buffer.append(checkNo.toString());
+ }
- private String getDisplayValue(XWikiContext context, int value) {
- try {
- XWikiMessageTool msg = (XWikiMessageTool) context.get("msg");
- String strname = getDisplayType() + "_" + value;
- String result = msg.get(strname);
- if (result.equals(strname)) {
- return "" + value;
- }
- return result;
- } catch (Exception e) {
- return "" + value;
- }
- }
+ private String getDisplayValue(XWikiContext context, int value) {
+ try {
+ XWikiMessageTool msg = (XWikiMessageTool) context.get("msg");
+ String strname = getDisplayType() + "_" + value;
+ String result = msg.get(strname);
+ if (result.equals(strname)) {
+ return "" + value;
+ }
+ return result;
+ } catch (Exception e) {
+ return "" + value;
+ }
+ }
- public void displaySelectSearch(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ public void displaySelectSearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context) {
select select = new select(prefix + name, 1);
select.setMultiple(true);
String String0 = getDisplayValue(context, 0);
@@ -218,7 +221,7 @@
buffer.append(select.toString());
}
- public void displayCheckboxSearch(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ public void displayCheckboxSearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context) {
org.apache.ecs.xhtml.input check = new input(input.checkbox, prefix + name, 1);
org.apache.ecs.xhtml.input checkNo = new input(input.hidden, prefix + name, 0);
@@ -249,4 +252,14 @@
buffer.append(check.toString());
buffer.append(checkNo.toString());
}
+
+ public void fromSearchMap(XWikiQuery query, Map map) {
+ String[] data = (String[])map.get("");
+ if (data!=null) {
+ Object[] data2 = new Object[data.length];
+ for (int i=0;i<data.length;i++)
+ data2[i] = fromString(data[i]).getValue();
+ query.setParam(getObject().getName() + "_" + getName(), data2);
+ }
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DBListClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,35 +1,35 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ *
+ * @author sdumitriu
+ */
package com.xpn.xwiki.objects.classes;
-import java.util.ArrayList;
-import java.util.List;
-
import com.xpn.xwiki.XWiki;
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.objects.meta.PropertyMetaClass;
-import com.xpn.xwiki.plugin.query.QueryPlugin;
+import com.xpn.xwiki.plugin.query.QueryPlugin;
+import java.util.ArrayList;
+import java.util.List;
+
public class DBListClass extends ListClass {
public DBListClass(PropertyMetaClass wclass) {
super("dblist", "DB List", wclass);
@@ -41,10 +41,10 @@
public List getList(XWikiContext context) {
XWiki xwiki = context.getWiki();
- try {
+ try {
if (xwiki.getHibernateStore()!=null)
- return xwiki.search(getSql(), context);
- else
+ return xwiki.search(getSql(), context);
+ else
return ((QueryPlugin)xwiki.getPlugin("query", context)).xpath(getSql()).list();
} catch (Exception e) {
e.printStackTrace();
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/DateClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,21 +23,22 @@
package com.xpn.xwiki.objects.classes;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.ecs.xhtml.input;
-import org.dom4j.Element;
-
import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.web.XWikiMessageTool;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.DateProperty;
import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
+import com.xpn.xwiki.web.XWikiMessageTool;
+import org.apache.ecs.xhtml.input;
+import org.dom4j.Element;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.Map;
+
public class DateClass extends PropertyClass {
public DateClass(PropertyMetaClass wclass) {
@@ -165,4 +166,19 @@
buffer.append(((XWikiMessageTool)context.get("msg")).get("to"));
buffer.append(input2.toString());
}
+
+ public void fromSearchMap(XWikiQuery query, Map map) {
+ String[] data = (String[])map.get("");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName(), fromString(data[0]).getValue());
+ else {
+ data = (String[])map.get("lessthan");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName() + "_lessthan", fromString(data[0]).getValue());
+ data = (String[])map.get("morethan");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName() + "_morethan", fromString(data[0]).getValue());
+
+ }
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/GroupsClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -2,15 +2,15 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
+import com.xpn.xwiki.objects.BaseCollection;
+import com.xpn.xwiki.objects.BaseProperty;
+import com.xpn.xwiki.objects.StringProperty;
import com.xpn.xwiki.objects.meta.PropertyMetaClass;
-import com.xpn.xwiki.objects.StringProperty;
-import com.xpn.xwiki.objects.BaseProperty;
-import com.xpn.xwiki.objects.BaseCollection;
+import org.apache.commons.lang.StringUtils;
+import org.apache.ecs.xhtml.button;
+import org.apache.ecs.xhtml.input;
+import org.apache.ecs.xhtml.option;
import org.apache.ecs.xhtml.select;
-import org.apache.ecs.xhtml.option;
-import org.apache.ecs.xhtml.input;
-import org.apache.ecs.xhtml.button;
-import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Iterator;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/LevelsClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -2,15 +2,15 @@
import com.xpn.xwiki.XWikiContext;
import com.xpn.xwiki.XWikiException;
-import com.xpn.xwiki.web.XWikiRequest;
import com.xpn.xwiki.objects.BaseCollection;
import com.xpn.xwiki.objects.BaseProperty;
import com.xpn.xwiki.objects.StringProperty;
import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.web.XWikiRequest;
import org.apache.commons.lang.StringUtils;
+import org.apache.ecs.xhtml.input;
import org.apache.ecs.xhtml.option;
import org.apache.ecs.xhtml.select;
-import org.apache.ecs.xhtml.input;
import java.util.ArrayList;
import java.util.Iterator;
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/ListClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -24,24 +24,19 @@
package com.xpn.xwiki.objects.classes;
-import java.util.*;
-
+import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.objects.*;
+import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
+import com.xpn.xwiki.web.XWikiMessageTool;
import org.apache.commons.lang.StringUtils;
import org.apache.ecs.xhtml.input;
import org.apache.ecs.xhtml.option;
import org.apache.ecs.xhtml.select;
import org.dom4j.Element;
-import com.xpn.xwiki.XWikiContext;
-import com.xpn.xwiki.plugin.query.XWikiCriteria;
-import com.xpn.xwiki.objects.BaseCollection;
-import com.xpn.xwiki.objects.BaseProperty;
-import com.xpn.xwiki.objects.DBStringListProperty;
-import com.xpn.xwiki.objects.ListProperty;
-import com.xpn.xwiki.objects.StringListProperty;
-import com.xpn.xwiki.objects.StringProperty;
-import com.xpn.xwiki.objects.meta.PropertyMetaClass;
-import com.xpn.xwiki.web.XWikiMessageTool;
+import java.util.*;
public abstract class ListClass extends PropertyClass {
@@ -288,7 +283,7 @@
}
}
- protected void displayRadioSearch(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context){
+ protected void displayRadioSearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context){
List list = getList(context);
List selectlist = new ArrayList();
@@ -319,7 +314,7 @@
}
}
- protected void displaySelectSearch(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context){
+ protected void displaySelectSearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context){
select select = new select(prefix + name, 1);
select.setMultiple(true);
select.setSize(getSize());
@@ -375,4 +370,9 @@
return;
}
+ public void fromSearchMap(XWikiQuery query, Map map) {
+ String[] data = (String[])map.get("");
+ if (data!=null)
+ query.setParam(getObject().getName() + "_" + getName(), fromStringArray(data).getValue());
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/NumberClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -23,21 +23,16 @@
package com.xpn.xwiki.objects.classes;
-import org.apache.ecs.xhtml.input;
-
import com.xpn.xwiki.XWikiContext;
+import com.xpn.xwiki.objects.*;
+import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import com.xpn.xwiki.plugin.query.XWikiCriteria;
+import com.xpn.xwiki.plugin.query.XWikiQuery;
import com.xpn.xwiki.web.XWikiMessageTool;
-import com.xpn.xwiki.plugin.query.XWikiCriteria;
-import com.xpn.xwiki.objects.BaseCollection;
-import com.xpn.xwiki.objects.BaseProperty;
-import com.xpn.xwiki.objects.DoubleProperty;
-import com.xpn.xwiki.objects.FloatProperty;
-import com.xpn.xwiki.objects.IntegerProperty;
-import com.xpn.xwiki.objects.LongProperty;
-import com.xpn.xwiki.objects.meta.PropertyMetaClass;
+import org.apache.ecs.xhtml.input;
+import java.util.List;
import java.util.Map;
-import java.util.List;
public class NumberClass extends PropertyClass {
@@ -118,12 +113,16 @@
buffer.append(input.toString());
}
- public void displaySearch(StringBuffer buffer, String name, String prefix, BaseCollection object, XWikiContext context) {
+ public void displaySearch(StringBuffer buffer, String name, String prefix, XWikiCriteria criteria, XWikiContext context) {
input input1 = new input();
input1.setType("text");
input1.setName(prefix + name + "_from");
input1.setID(prefix + name);
input1.setSize(getSize());
+ String fieldFullName = getFieldFullName();
+ String value = criteria.getParameter(fieldFullName + "_lessthan");
+ if (value!=null)
+ input1.setValue(value);
input input2 = new input();
@@ -131,6 +130,9 @@
input2.setName(prefix + name+ "_to");
input2.setID(prefix + name);
input2.setSize(getSize());
+ value = criteria.getParameter(fieldFullName + "_morethan");
+ if (value!=null)
+ input2.setValue(value);
buffer.append(((XWikiMessageTool)context.get("msg")).get("from"));
buffer.append(input1.toString());
@@ -158,4 +160,18 @@
}
}
+ public void fromSearchMap(XWikiQuery query, Map map) {
+ String data[] = (String[])map.get("");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName(), fromString(data[0]).getValue());
+ else {
+ data = (String[])map.get("lessthan");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName() + "_lessthan", fromString(data[0]).getValue());
+ data = (String[])map.get("morethan");
+ if ((data!=null)&&(data.length==1))
+ query.setParam(getObject().getName() + "_" + getName() + "_morethan", fromString(data[0]).getValue());
+
+ }
+ }
}
Modified: xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PasswordClass.java
===================================================================
--- xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PasswordClass.java 2006-09-12 11:48:06 UTC (rev 1308)
+++ xwiki/trunk/src/main/java/com/xpn/xwiki/objects/classes/PasswordClass.java 2006-09-12 20:04:10 UTC (rev 1309)
@@ -1,34 +1,33 @@
-/*
- * Copyright 2006, XpertNet SARL, and individual contributors as indicated
- * by the contributors.txt.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- *
- * @author sdumitriu
- */
+/*
+ * Copyright 2006, XpertNet SARL, and individual contributors as indicated
+ * by the contributors.txt.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTA