svn commit: [jahia] r20187 - in /branches/JAHIA-INCLUDE-TAG-BRANCH/core: ./ src/conf/java/ src/conf/java/org/jahia/services/search/analyzer/ src/java/javax/jcr/query/qom/ src/java/org/apache/lucene/ src/java/org/apache/lucene/analysis/ src/java/org/apache/lucene/index/ src/java/org/jahia/admin/homepages/ src/java/org/jahia/admin/production/ src/java/org/jahia/admin/search/ src/java/org/jahia/ajax/actionmenus/ src/java/org/jahia/ajax/chat/ src/java/org/jahia/ajax/searchhighlight/ src/java/org/jahia/ajax/webdav/ src/java/org/jahia/bin/ src/java/org/jahia/blogs/actions/ src/java/org/jahia/content/ src/java/org/jahia/data/beans/ src/java/org/jahia/data/containers/ src/java/org/jahia/data/fields/ src/java/org/jahia/engines/categories/ src/java/org/jahia/engines/containerlistproperties/ src/java/org/jahia/engines/mysettings/ src/java/org/jahia/engines/pages/ src/java/org/jahia/engines/shared/ src/java/org/jahia/hibernate/cache/ src/java/org/jahia/hibernate/dao/ src/java/org/jahia/hibernate/manager/ src/java/org/jahia/hibernate/model/ src/java/org/jahia/operations/ src/java/org/jahia/operations/valves/ src/java/org/jahia/params/ src/java/org/jahia/params/valves/ src/java/org/jahia/query/ src/java/org/jahia/query/dasl/ src/java/org/jahia/query/filtercreator/ src/java/org/jahia/query/qom/ src/java/org/jahia/services/cache/ src/java/org/jahia/services/cache/clusterservice/batch/ src/java/org/jahia/services/cache/jms/ src/java/org/jahia/services/categories/ src/java/org/jahia/services/containers/ src/java/org/jahia/services/events/ src/java/org/jahia/services/fields/ src/java/org/jahia/services/importexport/ src/java/org/jahia/services/lock/ src/java/org/jahia/services/mail/ src/java/org/jahia/services/metadata/ src/java/org/jahia/services/pages/ src/java/org/jahia/services/scheduler/ src/java/org/jahia/services/search/ src/java/org/jahia/services/search/analyzer/ src/java/org/jahia/services/search/compass/ src/java/org/jahia/services/search/lucene/ src/java/org/jahia/services/search/lucene/fs/ src/java/org/jahia/services/search/slide/ src/java/org/jahia/services/sites/ src/java/org/jahia/services/templates_deployer/ src/java/org/jahia/services/version/ src/java/org/jahia/services/webdav/ src/java/org/jahia/services/webdav/stores/ src/java/org/jahia/services/workflow/ src/java/org/jahia/settings/ src/java/org/jahia/taglibs/container/ src/java/org/jahia/taglibs/field/ src/java/org/jahia/taglibs/field/file/ src/java/org/jahia/taglibs/field/page/ src/java/org/jahia/taglibs/query/ src/java/org/jahia/taglibs/query/logs/ src/java/org/jahia/utils/ src/java/org/jahia/utils/zip/ src/java/org/jahia/workflow/nstep/ src/webapp/WEB-INF/etc/config/ src/webapp/WEB-INF/etc/spring/ src/webapp/WEB-INF/etc/taglibs/ src/webapp/WEB-INF/var/patches/groovy/ src/webapp/WEB-INF/var/shared_templates/ src/webapp/clippers/sqlpattern/ src/webapp/jsp/jahia/administration/ src/webapp/jsp/jahia/administration/search/include/ src/webapp/jsp/jahia/engines/application/ src/webapp/jsp/jahia/engines/containeredit/ src/webapp/jsp/jahia/engines/containerlistproperties/ src/webapp/jsp/jahia/engines/importexport/ src/webapp/jsp/jahia/engines/shared/ src/webapp/jsp/jahia/engines/workflow/ src/webapp/jsp/jahia/javascript/zimbra/complexTree/
sshyrkov at svndev.jahia.net
sshyrkov at svndev.jahia.net
Mon Mar 31 19:20:11 CEST 2008
Author: sshyrkov
Date: Mon Mar 31 19:20:10 2008
New Revision: 20187
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D20187&repname=
=3Djahia
Log:
Merged with trunk r20186
Added:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/services=
/search/analyzer/StandardTokenizerImpl.jflex
- copied unchanged from r20184, trunk/core/src/conf/java/org/jahia/se=
rvices/search/analyzer/StandardTokenizerImpl.jflex
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/javax/jcr/query/qom/Lit=
eral.java
- copied unchanged from r20184, trunk/core/src/java/javax/jcr/query/q=
om/Literal.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/
- copied from r20184, trunk/core/src/java/org/apache/lucene/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/
- copied from r20184, trunk/core/src/java/org/apache/lucene/analysis/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/CharArraySet.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/CharArraySet.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/LowerCaseFilter.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/LowerCaseFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/StopFilter.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/StopFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/Token.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/Token.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/TokenStream.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/TokenStream.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/analy=
sis/Tokenizer.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/analysis/Tokenizer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/index/
- copied from r20184, trunk/core/src/java/org/apache/lucene/index/
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/apache/lucene/index=
/Payload.java
- copied unchanged from r20184, trunk/core/src/java/org/apache/lucene=
/index/Payload.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerLuceneSorterBean.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/data/co=
ntainers/ContainerLuceneSorterBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ValueProviderFilter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/data/co=
ntainers/ValueProviderFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ValueProviderSorter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/data/co=
ntainers/ValueProviderSorter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/FilterCreator.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/f=
iltercreator/FilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/JahiaDBFilterCreator.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/f=
iltercreator/JahiaDBFilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/JahiaSearchFilterCreator.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/f=
iltercreator/JahiaSearchFilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
tainerQueryBuilder.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/q=
om/ContainerQueryBuilder.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Jah=
iaBaseQueryModelInterpreter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/q=
om/JahiaBaseQueryModelInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Lit=
eralImpl.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/q=
om/LiteralImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/QOM=
Node.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/q=
om/QOMNode.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Que=
ryObjectModelInterpreter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/query/q=
om/QueryObjectModelInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerListLoader.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/containers/ContainerListLoader.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerListLoaderContext.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/containers/ContainerListLoaderContext.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/JahiaLuceneAnalyzerTokenFilterProvider.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/analyzer/JahiaLuceneAnalyzerTokenFilterProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardTokenizerImpl.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/analyzer/StandardTokenizerImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/fs/JahiaIndexSearcher.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/lucene/fs/JahiaIndexSearcher.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/fs/LuceneCoreSearcher.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/lucene/fs/LuceneCoreSearcher.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/fs/LuceneQueryRequest.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/lucene/fs/LuceneQueryRequest.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/fs/LuceneSearchHandlerImpl.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/search/lucene/fs/LuceneSearchHandlerImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/work=
flow/RecipientInfo.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/service=
s/workflow/RecipientInfo.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ChildNodeTag.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/taglibs=
/query/ChildNodeTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/DefaultQueryModelInterpreter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/taglibs=
/query/DefaultQueryModelInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/DescendantNodeTag.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/taglibs=
/query/DescendantNodeTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/SelectorTag.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/taglibs=
/query/SelectorTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/RefCoun=
ted.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/utils/R=
efCounted.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/zip/Exc=
lusionWildcardFilter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/utils/z=
ip/ExclusionWildcardFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/zip/Pat=
hFilter.java
- copied unchanged from r20184, trunk/core/src/java/org/jahia/utils/z=
ip/PathFilter.java
Removed:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/org/jahia/services=
/search/analyzer/StandardTokenizer.jj
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
straintInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
straintToConstraintItemInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
tainerConstraintInterpreter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/CharStream.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/FastCharStream.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/ParseException.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardTokenizerConstants.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardTokenizerTokenManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/Token.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/TokenMgrError.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/AbstractLuceneSearchHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/IsNotNullTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/IsNullTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/JahiaContentQueryDefinitionTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/NotLikeTag.java
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_de.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_en.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_fr.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaMessageResour=
ces_de.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_de.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_en.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_es.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_it.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_pt.properties
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/javax/jcr/query/qom/Que=
ryObjectModelFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/homepag=
es/HomePageTool.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/product=
ion/ManageSiteProduction.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/search/=
ManageSearch.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetTimeBasedPublishingState.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetWorkflowState.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/chat/cha=
tAction.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/searchhi=
ghlight/SearchHighlightAction.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/webdav/S=
elecUnselectFile.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaErro=
rDisplay.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaInte=
rface.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/blogs/actions=
/AbstractAction.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntContainerKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntContainerListKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntFieldKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntMetadataKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntObject.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntObjectKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Conte=
ntPageKey.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/content/Jahia=
Object.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Co=
ntainerBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Co=
ntainerListBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Co=
ntentBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Fi=
eldBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Pa=
geBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/beans/Si=
teBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerChainedFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerFilterBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerFilterByCategories.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerFilterByContainerDefinitions.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerFilterByLoadRequest.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerFilters.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerMetadataFilterBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerSorterBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerSorterByContainerDefinition.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/ContainerSorterByLogsQuery.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerDefinition.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerList.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/containe=
rs/JahiaContainerSet.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/data/fields/J=
ahiaFieldDefinition.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/categ=
ories/ManageCategories.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/conta=
inerlistproperties/ContainerListProperties_Engine.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/myset=
tings/MySettingsEngine.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/pages=
/PageProperties_Engine.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/share=
d/BigText_Field.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/share=
d/Category_Field.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/engines/share=
d/Page_Field.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/cac=
he/JahiaBatchingClusterCacheHibernateProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/cac=
he/JahiaClusterCacheHibernateProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaContainerDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaContainerDefinitionDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaContainerListDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaFieldsDataDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaHomepageDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaPagesDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/dao=
/JahiaPagesDefinitionDAO.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaApplicationManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaAuditLogManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaContainerDefinitionManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaContainerManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaFieldsDataManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaFieldsDefinitionManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaGroupManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaHomepageManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaLinkManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaMarkupDefinitionManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaMarkupManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaObjectManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaPagesManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaRetentionRuleDefManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaRetentionRuleManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaSiteLanguageListManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaSiteLanguageMappingManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaSlideUriManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaUserManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/man=
ager/JahiaWorkflowManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/hibernate/mod=
el/JahiaCtnDef.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/operations/Pa=
geGeneratorQueue.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/operations/va=
lves/CacheWriteValve.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/operations/va=
lves/EngineValve.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/Proces=
singContext.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/params/valves=
/SessionAuthValveImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/QuerySe=
rvice.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/dasl/DA=
SLCompareExpression.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/dasl/DA=
SLSearchBuilder.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/dasl/Se=
archBuilderHelper.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/dasl/Se=
archBuilderTools.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/filterc=
reator/AbstractFilterCreator.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/And=
Impl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Bin=
dVariableValueImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Chi=
ldNodeImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Col=
umnImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Com=
parisonImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
straintImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Con=
straintItem.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Des=
cendantNodeImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Dyn=
amicOperandImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Ful=
lTextSearchImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Jah=
iaQueryObjectModelConstants.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/NoT=
erminalConstraint.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Not=
Impl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/OrI=
mpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Ord=
eringImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Pro=
pertyValueImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Que=
ryModelTools.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Que=
ryObjectModelFactoryImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Que=
ryObjectModelImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Sel=
ectorImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/query/qom/Sta=
ticOperandImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/CacheFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/clusterservice/batch/BatchingClusterServiceCacheProvider.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cach=
e/jms/JMSCacheImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cate=
gories/Category.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerACLRetriever.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerFactory.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContainerQueryContext.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContentContainer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/ContentContainerList.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/JahiaContainersBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/cont=
ainers/JahiaContainersService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/even=
ts/GroovyEventListener.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/fiel=
ds/ContentBigTextField.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/fiel=
ds/ContentFieldTools.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/fiel=
ds/ContentFileField.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/fiel=
ds/JahiaFieldBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/CategoriesImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportExportBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportExportService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ImportJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/PermissionsImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/ProductionJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/impo=
rtexport/UsersImportHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/lock=
/LockPrerequisites.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/mail=
/MailSettings.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/meta=
data/CoreMetadataConstant.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/ContentPage.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/JahiaPage.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/JahiaPageBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/page=
s/JahiaPageContentRights.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sche=
duler/BackgroundJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/ContainerSearchResultBuilderImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/ContainerSearcher.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaAbstractSearchResultBuilder.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearchBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearchResultBuilder.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/JahiaSearchService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/PageSearchResultBuilderImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchHandlerImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchResult.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchResultImpl.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/SearchTools.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/HighlightingAnalyzer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/LanguageIndependantFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/SlideStandardAnalyzer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/SnowballFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardAnalyzer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/StandardTokenizer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/ThreadLocalSnowballFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/TokenWithCommaFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/TokenWithDotFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/analyzer/TokenWithQuoteFilter.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/compass/LuceneQueryForHighlighting.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/compass/jahiaresource.cpm.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/AbstractLuceneSearchIndexer.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/JahiaAbstractHitCollector.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/JahiaHitCollector.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/JahiaLuceneQueryParser.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/JahiaLuceneSort.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/lucene/LuceneContainerSearcher.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/sear=
ch/slide/SlideSearchResult.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/site=
s/JahiaSite.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/temp=
lates_deployer/JahiaTemplatesDeployerBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/vers=
ion/EntryLoadRequest.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/JahiaWebdavBaseService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/webd=
av/stores/JahiaDescriptorsStore.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/work=
flow/ActivationJob.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/services/work=
flow/WorkflowService.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/settings/Sett=
ingsBean.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerListTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/conta=
iner/ContainerTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/field=
/AbstractFieldTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/field=
/file/FileFieldTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/field=
/page/PageFieldTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ComparisonTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ConstraintTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/ContainerQueryTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/CreateContainerQueryBeanTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/CreateContainerSorterFromLogsQueryTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/PropertyValueTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/QueryDefinitionTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/SetPropertyTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/SortByTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/taglibs/query=
/logs/LogsQueryTag.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/utils/zip/Jah=
iaArchiveFileHandler.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/workflow/nste=
p/NStepWorkflow.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/config/ja=
hia.skeleton
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-basejahiaconfig.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-compass.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/spring/ap=
plicationcontext-services.xml
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/c=
ontent.tld
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/etc/taglibs/q=
uery.tld
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/patches/g=
roovy/aclpatch_17886.groovy
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/patches/g=
roovy/containerlists_17919.groovy
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_te=
mplates/corporate_portal_templates.jar
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/WEB-INF/var/shared_te=
mplates/corporate_portal_templates_v2.jar
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/clippers/sqlpattern/s=
qlClipperPortletPattern.war
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/manage_components.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/manage_production.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/new_components.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/search/include/processing.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/administrat=
ion/site_choose_template_set.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/app=
lication/application.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/con=
taineredit/containeredit.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/con=
tainerlistproperties/containerlistproperties.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/imp=
ortexport/dispPickers.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/sha=
red/date_field.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/wor=
kflow/adv_workflow.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/engines/wor=
kflow/readonly_changeworkflow.jsp
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/javascript/=
zimbra/complexTree/PageInfoListView.js
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/webapp/jsp/jahia/javascript/=
zimbra/complexTree/cTree.css
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/project.xml&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/project.xml Mon Mar 31 19:20:10 =
2008
@@ -13,8 +13,7 @@
<siteDirectory>html/${pom.artifactId}/core</siteDirectory>
=
<repository>
- <connection>scm:cvs:pserver:anonymous at cvspub.jahia.org:/home/cvs/r=
epository_anonymous:${pom.artifactId}/core
- </connection>
+ <connection>scm:cvs:pserver:anonymous at cvspub.jahia.org:/home/cvs/r=
epository_anonymous:${pom.artifactId}/core</connection>
<url>http://cvspub.jahia.org/cgi-bin/cvsweb.cgi/${pom.artifactId}/=
core/</url>
</repository>
=
@@ -128,7 +127,7 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>3.1</version>
+ <version>3.2</version>
<properties>
<war.bundle>true</war.bundle>
<!-- ktlili: clipbuilder
@@ -326,7 +325,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>1.4-562144</version>
+ <version>1.5-614941</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -334,12 +333,36 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <version>1.4-562144</version>
+ <version>1.5-614941</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>1.5-614941</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>1.5-614941</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>1.5-614941</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>imagej</groupId>
<artifactId>imagej</artifactId>
<properties>
@@ -401,11 +424,11 @@
<dependency>
<groupId>jsr170</groupId>
<artifactId>jcr</artifactId>
- <version>0.16.2</version>
+ <version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
- <url>http://www.day.com/maven/jsr170/jars/jcr-0.15.jar</url>
+ <url>http://www.day.com/maven/jsr170/jars/jcr-1.0.jar</url>
</dependency>
<dependency>
<groupId>jdom</groupId>
@@ -685,7 +708,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.2-504.jdbc3</version>
+ <version>8.3-603.jdbc3</version>
<properties>
<war.bundle>true</war.bundle>
<!-- ktlili: clipbuilder
@@ -1657,26 +1680,26 @@
=
=
<!-- MUST BE PLATFORM SPECIFIC, only needed for shell (see proje=
ct.properties for override) -->
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev-platform</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.totsp.gwt</groupId>
- <artifactId>maven-googlewebtoolkit-plugin</artifactId>
- <version>1.5.6</version>
- <type>plugin</type>
- </dependency>
-
- <dependency>
- <groupId>jerichohtml</groupId>
- <artifactId>jericho-html</artifactId>
- <version>2.5</version>
- <properties>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev-platform</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.totsp.gwt</groupId>
+ <artifactId>maven-googlewebtoolkit-plugin</artifactId>
+ <version>1.5.6</version>
+ <type>plugin</type>
+ </dependency>
+
+ <dependency>
+ <groupId>jerichohtml</groupId>
+ <artifactId>jericho-html</artifactId>
+ <version>2.5</version>
+ <properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
=
</dependencies>
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources.properties Mon Mar 31 19:20:10 2008
@@ -377,7 +377,7 @@
org.jahia.admin.search.ManageSearch.indexingSite.label =3D Indexing a site=
, will load all the site's indexable fields (Text content) and build the in=
dex needed by the search engine.
org.jahia.admin.search.ManageSearch.indexNotExist.label =3D !! The search=
index do not exist yet,<br>you should perform a full re-index of the site.=
!!
org.jahia.admin.search.ManageSearch.indexOptimCompact.label =3D Index opt=
imization compacts the index database and speedup the searching and indexin=
g operations.
-org.jahia.admin.search.ManageSearch.indexOptimizSiteIndexingIsRunning.labe=
l =3D The site's indexation is processing in backgroung.
+org.jahia.admin.search.ManageSearch.indexOptimizSiteIndexingIsRunning.labe=
l =3D The site's indexation is processing in background.
org.jahia.admin.search.ManageSearch.indexOptimizSuccess.label =3D The ind=
ex has been optimized successfully.
org.jahia.admin.search.ManageSearch.jahiaManageSearch.label =3D Jahia - M=
anage Search Engine
org.jahia.admin.search.ManageSearch.noteWhenContent.label =3D Note : When=
content are added to Jahia using the Add and Update engines, they are auto=
matically indexed.
@@ -1053,6 +1053,8 @@
org.jahia.admin.productionManager.form.cron =3D Cron expression for schedu=
ling :<br>(or an hour:minutes format for an every day task)
org.jahia.admin.productionManager.form.sync =3D Is this Job a syncronisati=
on to an already existing site or a full new export ? (checked for full)
org.jahia.admin.productionManager.form.metadata =3D Export metadata
+org.jahia.admin.productionManager.form.workflow =3D Export workflow settin=
gs
+org.jahia.admin.productionManager.form.acls =3D Export ACLs
org.jahia.admin.productionManager.form.error.required.cron =3D Cron expres=
sion must not be empty
org.jahia.admin.productionManager.form.error.required.password =3D Passwor=
d must not be empty
org.jahia.admin.productionManager.form.error.required.profile =3D Profile =
must not be empty
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_en.properties&=
rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_en.properties Mon Mar 31 19:20:10 2008
@@ -377,7 +377,7 @@
org.jahia.admin.search.ManageSearch.indexingSite.label =3D Indexing a site=
, will load all the site's indexable fields (Text content) and build the in=
dex needed by the search engine.
org.jahia.admin.search.ManageSearch.indexNotExist.label =3D !! The search=
index do not exist yet,<br>you should perform a full re-index of the site.=
!!
org.jahia.admin.search.ManageSearch.indexOptimCompact.label =3D Index opt=
imization compacts the index database and speedup the searching and indexin=
g operations.
-org.jahia.admin.search.ManageSearch.indexOptimizSiteIndexingIsRunning.labe=
l =3D The site's indexation is processing in backgroung.
+org.jahia.admin.search.ManageSearch.indexOptimizSiteIndexingIsRunning.labe=
l =3D The site's indexation is processing in background.
org.jahia.admin.search.ManageSearch.indexOptimizSuccess.label =3D The ind=
ex has been optimized successfully.
org.jahia.admin.search.ManageSearch.jahiaManageSearch.label =3D Jahia - M=
anage Search Engine
org.jahia.admin.search.ManageSearch.noteWhenContent.label =3D Note : When=
content are added to Jahia using the Add and Update engines, they are auto=
matically indexed.
@@ -1053,6 +1053,8 @@
org.jahia.admin.productionManager.form.cron =3D Cron expression for schedu=
ling :<br>(or an hour:minutes format for an every day task)
org.jahia.admin.productionManager.form.sync =3D Is this Job a syncronisati=
on to an already existing site or a full new export ? (checked for full)
org.jahia.admin.productionManager.form.metadata =3D Export metadata
+org.jahia.admin.productionManager.form.workflow =3D Export workflow settin=
gs
+org.jahia.admin.productionManager.form.acls =3D Export ACLs
org.jahia.admin.productionManager.form.error.required.cron =3D Cron expres=
sion must not be empty
org.jahia.admin.productionManager.form.error.required.password =3D Passwor=
d must not be empty
org.jahia.admin.productionManager.form.error.required.profile =3D Profile =
must not be empty
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdminis=
trationResources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaAdministrationResources_fr.properties&=
rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaAdministratio=
nResources_fr.properties Mon Mar 31 19:20:10 2008
@@ -485,6 +485,8 @@
org.jahia.admin.productionManager.form.error.required.targetSite =3D Le si=
te cible doit =C3=AAtre sp=C3=A9cifi=C3=A9
org.jahia.admin.productionManager.form.error.required.username =3D Le nom =
d'utilisateur doit =C3=AAtre sp=C3=A9cifi=C3=A9
org.jahia.admin.productionManager.form.metadata =3D Exporter les m=C3=A9ta=
donn=C3=A9es
+org.jahia.admin.productionManager.form.workflow =3D Exporter les reglages =
de workflow
+org.jahia.admin.productionManager.form.acls =3D Exporter les ACLs
org.jahia.admin.productionManager.form.password =3D Mot de passe de l'util=
isateur sur le site distant :
org.jahia.admin.productionManager.form.profile =3D Utilisateur =C3=A0 expo=
rter sur le site source :
org.jahia.admin.productionManager.form.sync =3D Ce travail est-il une sync=
hronisation avec un site existant ou un export complet ? (cochez en ca=
s d'export complet)
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEngines=
Resources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D2018=
7&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces.properties Mon Mar 31 19:20:10 2008
@@ -594,6 +594,7 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lertSelectValue.label =3D Please select a value
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalAscending.label =3D Ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalDescending.label =3D Descending
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
reDisplayed =3D are displayed
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
utomaticRanking.label =3D Automatic Ranking
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
hooseAnAutomaticSort.label =3D Choose an automatic sort
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListSettings.label =3D Content object list settings
@@ -601,15 +602,20 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
urrentFiled.label =3D Current Field
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ursorField.label =3D Cursor field
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D The content object list is empty. You ma=
y edit the rights if you want.
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSort.label =3D Use DB optimized sort
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSortExplanation.label =3D (Uncheck only if you need language \"n=
atural\" sorting on that field, to work properly with special characters li=
ke '=C3=A9','=C3=A0'. But performance can be bad).
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
d.label =3D ID
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderAscending.label =3D Insertion order, ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderDescending.label =3D Insertion order, descending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
anualRanking.label =3D Manual Ranking
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
axContainersToDisplay.label =3D Nb. of Containers to display
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAContainerUpOrDown.label =3D Move a content object up or down
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAtBottom.label =3D Move at bottom
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveDown.label =3D Move down
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveOnTop.label =3D Move on top
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveUp.label =3D Move up
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
nly =3D only
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
utOf =3D out of
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.s=
ortBy.label =3D Sort by
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.n=
otPublished.label =3D Not Published
org.jahia.engines.contentdefinition.contentDefinition.label =3D Content De=
finition
@@ -634,7 +640,7 @@
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label =
=3D The following links will be deleted
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D =
Delete the Jahia object and close window
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label =
=3D The following pages will be deleted
-org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D All subpages and the links to those pages will also be deleted=
. The following list is just partial:
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D All subpages and the links to those pages will also be deleted=
. The following list is just partial
org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks=
.label =3D The following content objects contain hardcoded links to the del=
eted content
org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID
org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na=
me
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEngines=
Resources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D2=
0187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_de.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_de.properties Mon Mar 31 19:20:10 2008
@@ -593,6 +593,7 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lertSelectValue.label =3D W\u00E4hlen Sie einen Wert aus.
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalAscending.label =3D Aufsteigend
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalDescending.label =3D Absteigend
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
reDisplayed =3D are displayed
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
utomaticRanking.label =3D Automatische Priorit\u00E4tsbestimmung
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
hooseAnAutomaticSort.label =3D W\u00E4hlen Sie eine automatische Sortierung
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListSettings.label =3D Einstellungen der Content Objekt-Liste
@@ -600,15 +601,20 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
urrentFiled.label =3D Aktuelles Feld
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ursorField.label =3D Cursor-Feld
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D Die Content Objekt-Liste ist leer. Sie k=
\u00F6nnen die Rechte falls gew\u00FCnscht \u00E4ndern.
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSort.label =3D Use DB optimized sort
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSortExplanation.label =3D (Uncheck only if you need language \"n=
atural\" sorting on that field, to work properly with special characters li=
ke '=C3=A9','=C3=A0'. But performance can be bad).
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
d.label =3D ID
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderAscending.label =3D Einf\u00FCgereihenfolge, aufsteigend
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderDescending.label =3D Einf\u00FCgereihenfolge, absteigend
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
anualRanking.label =3D Manuelle Priorit\u00E4tsbestimmung
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
axContainersToDisplay.label =3D Nb. of Containers to display
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAContainerUpOrDown.label =3D Content Objekt nach oben oder unten verschi=
eben
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAtBottom.label =3D Nach ganz unten verschieben
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveDown.label =3D Nach unten verschieben
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveOnTop.label =3D Nach ganz oben verschieben
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveUp.label =3D Nach oben verschieben
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
nly =3D only
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
utOf =3D out of
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.s=
ortBy.label =3D Sortieren nach
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.n=
otPublished.label =3D Nicht ver\u00F6ffentlicht
org.jahia.engines.contentdefinition.contentDefinition.label =3D Content-De=
finition
@@ -633,7 +639,7 @@
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label =
=3D Die folgenden Links werden gel\u00F6scht
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D =
Jahia-Objekt l\u00F6schen und Fenster schlie\u00DFen.
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label =
=3D Die folgenden Seiten werden gel\u00F6scht
-org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D Alle Unterseiten und Verweise zu diesen Seiten werden mitgel\u=
00F6scht. Die folgende Liste ist nur ein Auszug: =
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D Alle Unterseiten und Verweise zu diesen Seiten werden mitgel\u=
00F6scht. Die folgende Liste ist nur ein Auszug
org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks=
.label =3D Die folgenden Content-Objekte enthalten fest programmierte Links=
zu gel\u00F6schtem Content
org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID
org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na=
me
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEngines=
Resources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D2=
0187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_en.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_en.properties Mon Mar 31 19:20:10 2008
@@ -327,6 +327,8 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
urrentFiled.label =3D Current Field
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ursorField.label =3D Cursor field
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D The content object list is empty. You ma=
y edit the rights if you want.
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSort.label =3D Use DB optimized sort
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSortExplanation.label =3D (Uncheck only if you need language \"n=
atural\" sorting on that field, to work properly with special characters li=
ke '=C3=A9','=C3=A0'. But performance can be bad).
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
d.label =3D ID
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderAscending.label =3D Insertion order, ascending
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderDescending.label =3D Insertion order, descending
@@ -360,7 +362,7 @@
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label =
=3D The following links will be deleted
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D =
Delete the Jahia object and close window
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label =
=3D The following pages will be deleted
-org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D All sub pages and the links to those pages will also be delete=
d. The following list is just partial:
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D All sub pages and the links to those pages will also be delete=
d. The following list is just partial
org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks=
.label =3D The following content objects contain hardcoded links to the del=
eted content
org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID
org.jahia.engines.deletecontainer.DeleteContainer_Engine.name.label =3D Na=
me
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEngines=
Resources_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D2=
0187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_fr.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaEnginesResour=
ces_fr.properties Mon Mar 31 19:20:10 2008
@@ -118,6 +118,7 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lertSelectValue.label =3D Veuillez s=C3=A9lectionner une valeur
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalAscending.label =3D Croissant
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
lphabeticalDescending.label =3D D=C3=A9croissant
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
reDisplayed =3D sont affich=C3=A9s
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.a=
utomaticRanking.label =3D Classement automatique
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
hooseAnAutomaticSort.label =3D Choisir un tri automatique
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ontainerListSettings.label =3D Propri=C3=A9t=C3=A9s de la liste des objets =
de contenu
@@ -125,16 +126,21 @@
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
urrentFiled.label =3D Champ actuel
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.c=
ursorField.label =3D Champ curseur
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.e=
mptyContainerListWarning.label =3D La liste des objets de contenu est vide.=
Vous pouvez =C3=A9diter les droits si vous le souhaitez.
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSort.label =3D Utiliser le mode de tri optimis=C3=A9
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.u=
seOptimizedSortExplanation.label =3D (D=C3=A9cocher seulement si le tri sur=
ce champ doit supporter des caract=C3=A8res sp=C3=A9ciaux comme '=C3=A9','=
=C3=A0'. Le tri peux =C3=AAtre plus lent).
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
d.label =3D ID
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderAscending.label =3D Par ordre d'insertion, croissant
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.i=
nsertionOrderDescending.label =3D Par ordre d'insertion, d=C3=A9croissant
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
anualRanking.label =3D Classement manuel
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
axContainersToDisplay.label =3D Nb. max d'objets =C3=A0 afficher
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAContainerUpOrDown.label =3D D=C3=A9placer un objet de contenu vers le h=
aut ou vers le bas
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveAtBottom.label =3D D=C3=A9placer tout en bas
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveDown.label =3D D=C3=A9placer vers le bas
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveOnTop.label =3D D=C3=A9placer tout en haut
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.m=
oveUp.label =3D D=C3=A9placer vers le haut
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.n=
otPublished.label =3D Non publi=C3=A9
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
nly =3D seul
+org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.o=
utOf =3D sur
org.jahia.engines.containerlistproperties.ContainerListProperties_Engine.s=
ortBy.label =3D Trier par
org.jahia.engines.contentdefinition.contentDefinition.label =3D D=C3=A9fin=
ition de contenu
org.jahia.engines.contentdefinition.contentDefinitionName.label =3D Nom
@@ -157,6 +163,7 @@
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delLinks.label =
=3D Les liens suivants vont =C3=AAtre supprim=C3=A9s
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delObj.label =3D =
Supprimer l'objet Jahia et fermer la fen=C3=AAtre
org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPages.label =
=3D Les pages suivantes vont =C3=AAtre supprim=C3=A9es
+org.jahia.engines.deletecontainer.DeleteContainer_Engine.delPagesPartialLi=
st.label =3D Toutes les sous-pages et les liens vers ces pages vont &eactue=
;galement être supprimés. La liste suivante n'est pas exhausti=
ve
org.jahia.engines.deletecontainer.DeleteContainer_Engine.deleteContainer.l=
abel =3D Supprimer l'objet de contenu
org.jahia.engines.deletecontainer.DeleteContainer_Engine.futureBrokenLinks=
.label =3D Les objets de contenu suivants contiennent des liens cod=C3=A9s =
en dur vers le contenu supprim=C3=A9
org.jahia.engines.deletecontainer.DeleteContainer_Engine.id.label =3D ID
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaMessage=
Resources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/JahiaMessageResources_de.properties&rev=3D2=
0187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaMessageResour=
ces_de.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/JahiaMessageResour=
ces_de.properties Mon Mar 31 19:20:10 2008
@@ -370,18 +370,18 @@
org.jahia.services.workflow.WorkflowService.noAdminRightsError =3D Validie=
rung nicht m=C3=B6glich. Sie ben=C3=B6tigen hierf=C3=BCr Administratorrecht=
e.
org.jahia.services.workflow.WorkflowService.mail.subject =3D """[JAHIA] Wo=
rkflow-=C3=84nderung durch Benutzer ${processingContext.getUser().getUserna=
me()} auf Seite(n): ${pageTitleList}"""
org.jahia.services.workflow.WorkflowService.mail.intro =3D """Jahia-Workfl=
ow \endash E-Mail-Benachrichtung.\n=C3=84nderungen durch Benutzer ${proces=
singContext.getUser().getUsername()}."""
-org.jahia.services.workflow.WorkflowService.mail.intro.html =3D {\highligh=
t3 """}<h1>Jahia-Workflow \endash E-Mail-Benachrichtung.</h1>{\highlight3 =
\n}<h2>=C3=84nderungen durch Benutzer ${processingContext.getUser().getUser=
name()}.</h2>{\highlight3 """}
+org.jahia.services.workflow.WorkflowService.mail.intro.html =3D """<h1>Jah=
ia-Workflow \endash E-Mail-Benachrichtung.</h1>\n<h2>=C3=84nderungen durch=
Benutzer ${processingContext.getUser().getUsername()}.</h2>"""
org.jahia.services.workflow.WorkflowService.mail.commentLabel =3D """Komme=
ntar"""
org.jahia.services.workflow.WorkflowService.mail.approved.text =3D """Gene=
hmigt und ver=C3=B6ffentlicht:\n-------------------------------------------=
-----------------------------------\nDie folgenden Seiten sind jetzt online=
:"""
-org.jahia.services.workflow.WorkflowService.mail.approved.html =3D {\highl=
ight3 """}<h2>Genehmigt und ver=C3=B6ffentlicht</h2><p>Die folgenden Seiten=
sind jetzt online:</p>{\highlight3 """}
+org.jahia.services.workflow.WorkflowService.mail.approved.html =3D """<h2>=
Genehmigt und ver=C3=B6ffentlicht</h2><p>Die folgenden Seiten sind jetzt on=
line:</p>"""
org.jahia.services.workflow.WorkflowService.mail.refused.text =3D """Abgel=
ehnt:\n--------------------------------------------------------------------=
----------\nDie folgenden Seiten wurden nicht zur Ver=C3=B6ffentlichung fre=
igegeben und sind erneut im Bearbeitungsmodus verf=C3=BCgbar. Nehmen Sie di=
e erforderlichen =C3=84nderungen vor."""
-org.jahia.services.workflow.WorkflowService.mail.refused.html =3D {\highli=
ght3 """}<h2>Abgelehnt</h2><p>Die folgenden Seiten wurden nicht zur Ver=C3=
=B6ffentlichung freigegeben und sind erneut im Bearbeitungsmodus verf=C3=BC=
gbar. Nehmen Sie die erforderlichen =C3=84nderungen vor.</p>{\highlight3 ""=
"}
+org.jahia.services.workflow.WorkflowService.mail.refused.html =3D """<h2>A=
bgelehnt</h2><p>Die folgenden Seiten wurden nicht zur Ver=C3=B6ffentlichung=
freigegeben und sind erneut im Bearbeitungsmodus verf=C3=BCgbar. Nehmen Si=
e die erforderlichen =C3=84nderungen vor.</p>"""
org.jahia.services.workflow.WorkflowService.mail.waiting.text =3D """Auf G=
enehmigung warten:\n-------------------------------------------------------=
-----------------------\nDie folgenden Seiten k=C3=B6nnen jetzt ver=C3=B6ff=
entlicht werden. Best=C3=A4tigen Sie ihre Ver=C3=B6ffentlichung oder lehnen=
Sie sie ab."""
-org.jahia.services.workflow.WorkflowService.mail.waiting.html =3D {\highli=
ght3 """}<h2>Auf Genehmigung warten.</h2><p>Die folgenden Seiten k=C3=B6nne=
n jetzt ver=C3=B6ffentlicht werden. Best=C3=A4tigen Sie ihre Ver=C3=B6ffent=
lichung oder lehnen Sie sie ab.</p>{\highlight3 """}
+org.jahia.services.workflow.WorkflowService.mail.waiting.html =3D """<h2>A=
uf Genehmigung warten.</h2><p>Die folgenden Seiten k=C3=B6nnen jetzt ver=C3=
=B6ffentlicht werden. Best=C3=A4tigen Sie ihre Ver=C3=B6ffentlichung oder l=
ehnen Sie sie ab.</p>"""
org.jahia.services.workflow.WorkflowService.mail.deleted.text =3D """Gel=
=C3=B6scht:\n--------------------------------------------------------------=
----------------\nDie folgenden Seiten wurden gel=C3=B6scht:"""
-org.jahia.services.workflow.WorkflowService.mail.deleted.html =3D {\highli=
ght3 """}<h2>Gel=C3=B6scht</h2><p>Die folgenden Seiten wurden gel=C3=B6scht=
:</p>{\highlight3 """}
+org.jahia.services.workflow.WorkflowService.mail.deleted.html =3D """<h2>G=
el=C3=B6scht</h2><p>Die folgenden Seiten wurden gel=C3=B6scht:</p>"""
org.jahia.services.workflow.WorkflowService.mail.failed.text =3D """Fehlge=
schlagen:\n----------------------------------------------------------------=
--------------\nDie folgenden Seiten konnten nicht im Workflow verarbeitet =
werden:"""
-org.jahia.services.workflow.WorkflowService.mail.failed.html =3D {\highlig=
ht3 """}<h2>Fehlgeschlagen:</h2><p>Die folgenden Seiten konnten nicht im Wo=
rkflow verarbeitet werden:</p>{\highlight3 """}
+org.jahia.services.workflow.WorkflowService.mail.failed.html =3D """<h2>Fe=
hlgeschlagen:</h2><p>Die folgenden Seiten konnten nicht im Workflow verarbe=
itet werden:</p>"""
org.jahia.services.workflow.WorkflowService.mail.link =3D Link zu Seite
org.jahia.services.workflow.WorkflowService.childObjectHaveSeparatedWorkfl=
owAndYouCannotWorklowItError =3D Dieses Objekt geh=C3=B6rt zu einem anderen=
Workflow. Sie haben keine Berechtigungen daf=C3=BCr. Wenden Sie sich an Ih=
ren Administrator.
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workfl=
owResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/nstep-workflowResources_de.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_de.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_de.properties Mon Mar 31 19:20:10 2008
@@ -9,7 +9,7 @@
process.three_validation_step_workflow.mail.body.rollback =3D """Die =C3=
=84nderung auf Seite \"${mailInfo.getDisplayName()}\" wurde abgelehnt. Zur=
=C3=BCck zu \"${mailInfo.getCurrentStepLabel()}\"\nLink zu Seite: PageLink"=
""
process.three_validation_step_workflow.mail.body.finish.published =3D """D=
ie Seite \"${mailInfo.getDisplayName()}\" ist jetzt online. \nLink zu Seite=
: PageLink"""
process.three_validation_step_workflow.mail.body.finish.deleted =3D """Die=
Seite \"${mailInfo.getDisplayName()}\" ist jetzt gel=C3=B6scht."""
-process.three_validation_step_workflow.mail.body.step.advance =3D """Sie m=
=C3=BCssen die von \"${mailInfo.getAuthorName()}\" bearbeitete Seite \"${ma=
ilInfo.getDisplayName()}\" validieren, um vom Schritt \"${mailInfo.getCurre=
ntStepLabel()}\"\nzu Schritt \"${mailInfo.getNextStepLabel()}\"zu gelangen.=
\nLink zu Seite: PageLink"""
+process.three_validation_step_workflow.mail.body.step.advance =3D """Sie m=
=C3=BCssen die von \"${mailInfo.getAuthorName()}\" bearbeitete Seite \"${ma=
ilInfo.getDisplayName()}\" validieren, um vom Schritt \"${mailInfo.getCurre=
ntStepLabel()}\"\nzu Schritt \"${mailInfo.getNextStepLabel()}\" zu gelangen=
.\nLink zu Seite: PageLink"""
process.three_validation_step_workflow.display.name =3D Validierung in dre=
i Schritten
process.three_validation_step_workflow.step.first_step =3D 1. Bearbeitung =
der aktuellen Seite melden
process.three_validation_step_workflow.step.second_step =3D 2. Bearbeitung=
der aktuellen Seite validieren
@@ -18,14 +18,14 @@
process.three_validation_step_workflow.step.rollback_to_author =3D Zur=C3=
=BCck zum Autor
process.three_validation_step_workflow.step.unlock =3D Schnellkorrektur
process.three_validation_step_workflow.step.lock =3D Korrektur beenden
-process.four_validation_step_workflow.notification.template.path =3D exter=
nal_workflows/nstep_workflow_mailnotif.groovy
+process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
process.four_validation_step_workflow.mail.subject =3D "[JAHIA] Workflow "=
+ processName + " ge=C3=A4ndert durch Benutzer " +userName+ " auf Seite(n)=
"+pageTitleList
process.four_validation_step_workflow.mail.body.introduction =3D "[JAHIA] =
Workflow "+processName+" mit =C3=9Cbersicht der Aktionen von Benutzer "+use=
rName+" in der Sprache "+language
process.four_validation_step_workflow.mail.body.rollback.to.author =3D """=
Die =C3=84nderung auf Seite \"${mailInfo.getDisplayName()}\" wurde abgelehn=
t. \nLink zu Seite: PageLink"""
process.four_validation_step_workflow.mail.body.rollback =3D """Die =C3=84=
nderung auf Seite \"${mailInfo.getDisplayName()}\" wurde abgelehnt. Zur=C3=
=BCck zu \"${mailInfo.getCurrentStepLabel()}\"\nLink zu Seite: PageLink"""
process.four_validation_step_workflow.mail.body.finish.published =3D """Di=
e Seite \"${mailInfo.getDisplayName()}\" ist jetzt online. \nLink zu Seite:=
PageLink"""
process.four_validation_step_workflow.mail.body.finish.deleted =3D """Die =
Seite \"${mailInfo.getDisplayName()}\" ist jetzt gel=C3=B6scht."""
-process.four_validation_step_workflow.mail.body.step.advance =3D """Sie m=
=C3=BCssen die von \"${mailInfo.getAuthorName()}\" bearbeitete Seite \"${ma=
ilInfo.getDisplayName()}\" validieren, um vom Schritt \"${mailInfo.getCurre=
ntStepLabel()}\"\nzu Schritt \"${mailInfo.getNextStepLabel()}\"zu gelangen.=
\nLink zu Seite: PageLink"""
+process.four_validation_step_workflow.mail.body.step.advance =3D """Sie m=
=C3=BCssen die von \"${mailInfo.getAuthorName()}\" bearbeitete Seite \"${ma=
ilInfo.getDisplayName()}\" validieren, um vom Schritt \"${mailInfo.getCurre=
ntStepLabel()}\"\nzu Schritt \"${mailInfo.getNextStepLabel()}\" zu gelangen=
.\nLink zu Seite: PageLink"""
process.four_validation_step_workflow.display.name =3D Validierung in vier=
Schritten
process.four_validation_step_workflow.step.first_step =3D 1. Bearbeitung d=
er aktuellen Seite melden
process.four_validation_step_workflow.step.second_step =3D 2. Bearbeitung =
der aktuellen Seite validieren
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workfl=
owResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/nstep-workflowResources_en.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_en.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_en.properties Mon Mar 31 19:20:10 2008
@@ -21,7 +21,7 @@
process.three_validation_step_workflow.step.rollback_to_author =3D Rollbac=
k to author
process.three_validation_step_workflow.step.unlock =3D Quick correction
process.three_validation_step_workflow.step.lock =3D Finish correction
-process.four_validation_step_workflow.notification.template.path =3D exter=
nal_workflows/nstep_workflow_mailnotif.groovy
+process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
process.four_validation_step_workflow.mail.subject =3D "[JAHIA] Workflow "=
+ processName + " modification(s) by user " +userName+" on page(s) "+pageT=
itleList
process.four_validation_step_workflow.mail.body.introduction =3D "[JAHIA] =
Workflow "+processName+" summary of actions made by user "+userName+" in la=
nguage "+language
process.four_validation_step_workflow.mail.body.rollback.to.author =3D """=
The modification on page \"${mailInfo.getDisplayName()}\" have been refused=
. \nLink to page : PageLink"""
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workfl=
owResources_es.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/nstep-workflowResources_es.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_es.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_es.properties Mon Mar 31 19:20:10 2008
@@ -18,7 +18,7 @@
process.three_validation_step_workflow.step.rollback_to_author =3D Retroce=
der al autor
process.three_validation_step_workflow.step.unlock =3D Correcci=C3=B3n r=
=C3=A1pida
process.three_validation_step_workflow.step.lock =3D Finalizar correcci=C3=
=B3n
-process.four_validation_step_workflow.notification.template.path =3D exter=
nal_workflows/nstep_workflow_mailnotif.groovy
+process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
process.four_validation_step_workflow.mail.subject =3D "Modificaciones del=
flujo de trabajo [JAHIA] " + processName + " realizadas por el usuario " +=
userName+" en las p=C3=A1ginas "+pageTitleList
process.four_validation_step_workflow.mail.body.introduction =3D "Resumen =
del flujo de trabajo [JAHIA] "+processName+" de las acciones realizadas por=
el usuario "+userName+" en idioma "+language
process.four_validation_step_workflow.mail.body.rollback.to.author =3D """=
Las modificaciones de la p=C3=A1gina \"${mailInfo.getDisplayName()}\" han s=
ido rechazadas. \nV=C3=ADnculo a la p=C3=A1gina: PageLink"""
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workfl=
owResources_it.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/nstep-workflowResources_it.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_it.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_it.properties Mon Mar 31 19:20:10 2008
@@ -18,7 +18,7 @@
process.three_validation_step_workflow.step.rollback_to_author =3D Riprist=
ina ad autore
process.three_validation_step_workflow.step.unlock =3D Correzione rapida
process.three_validation_step_workflow.step.lock =3D Termina correzione
-process.four_validation_step_workflow.notification.template.path =3D exter=
nal_workflows/nstep_workflow_mailnotif.groovy
+process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
process.four_validation_step_workflow.mail.subject =3D "[JAHIA] Modifica/c=
he del flusso di lavoro " + processName + " da parte dell'utente " +userNam=
e+" alla pagina/e "+pageTitleList
process.four_validation_step_workflow.mail.body.introduction =3D "[JAHIA] =
Riepilogo delle azioni del flusso di lavoro "+processName+" effettuate dall=
'utente "+userName+" nella lingua "+language
process.four_validation_step_workflow.mail.body.rollback.to.author =3D """=
La modifica a pagina \"${mailInfo.getDisplayName()}\" =C3=A8 stata rifiutat=
a. \nCollegamento a pagina: PageLink"""
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workfl=
owResources_pt.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/conf/java/nstep-workflowResources_pt.properties&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_pt.properties (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/conf/java/nstep-workflowReso=
urces_pt.properties Mon Mar 31 19:20:10 2008
@@ -18,7 +18,7 @@
process.three_validation_step_workflow.step.rollback_to_author =3D Reverte=
r para autor
process.three_validation_step_workflow.step.unlock =3D Corre=C3=A7=C3=A3o =
r=C3=A1pida
process.three_validation_step_workflow.step.lock =3D Concluir corre=C3=A7=
=C3=A3o
-process.four_validation_step_workflow.notification.template.path =3D exter=
nal_workflows/nstep_workflow_mailnotif.groovy
+process.three_validation_step_workflow.notification.template.path =3D exte=
rnal_workflows/nstep_workflow_mailnotif.groovy
process.four_validation_step_workflow.mail.subject =3D "[JAHIA] Modifica=
=C3=A7=C3=B5es do fluxo de trabalho " + processName + " pelo usu=C3=A1rio "=
+userName+" na(s) p=C3=A1gina(s) "+pageTitleList
process.four_validation_step_workflow.mail.body.introduction =3D "[JAHIA] =
Resumo de a=C3=A7=C3=B5es do fluxo de trabalho "+processName+" efetuadas pe=
lo usu=C3=A1rio "+userName+" no idioma "+language
process.four_validation_step_workflow.mail.body.rollback.to.author =3D """=
A modifica=C3=A7=C3=A3o na p=C3=A1gina \"${mailInfo.getDisplayName()}\" foi=
rejeitada. \nLink para a p=C3=A1gina: PageLink"""
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/javax/jcr/query/q=
om/QueryObjectModelFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/javax/jcr/query/qom/QueryObjectModelFactory.java=
&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/javax/jcr/query/qom/Que=
ryObjectModelFactory.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/javax/jcr/query/qom/Que=
ryObjectModelFactory.java Mon Mar 31 19:20:10 2008
@@ -576,7 +576,17 @@
public BindVariableValue bindVariable(String bindVariableName)
throws InvalidQueryException, RepositoryException;
=
- ///
+
+ /**
+ * Evaluates to a Literal =
+ * @param value
+ * @return
+ * @throws InvalidQueryException
+ * @throws RepositoryException
+ */
+ public Literal literal(Value value)
+ throws InvalidQueryException, RepositoryException;
+
/// ORDERING
///
=
@@ -584,22 +594,24 @@
* Orders by the value of the specified operand, in ascending order.
*
* @param operand the operand by which to order; non-null
+ * @param localeSensitive use locale-sensitive String comparison
* @return the ordering
* @throws InvalidQueryException if the query is invalid
* @throws RepositoryException if the operation otherwise fails
*/
- public Ordering ascending(DynamicOperand operand)
+ public Ordering ascending(DynamicOperand operand, boolean localeSensit=
ive)
throws InvalidQueryException, RepositoryException;
=
/**
* Orders by the value of the specified operand, in descending order.
*
* @param operand the operand by which to order; non-null
+ * @param localeSensitive use locale-sensitive String comparison
* @return the ordering
* @throws InvalidQueryException if the query is invalid
* @throws RepositoryException if the operation otherwise fails
*/
- public Ordering descending(DynamicOperand operand)
+ public Ordering descending(DynamicOperand operand, boolean localeSensi=
tive)
throws InvalidQueryException, RepositoryException;
=
///
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/h=
omepages/HomePageTool.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/homepages/HomePageTool.java&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/homepag=
es/HomePageTool.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/homepag=
es/HomePageTool.java Mon Mar 31 19:20:10 2008
@@ -44,6 +44,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.Locale;
=
/**
* desc: This class is used by the administration to choose an home page.
@@ -168,7 +169,7 @@
int pageID =3D SelectPage_Engine.getInstance ().getSelectedPageID =
(new HttpSessionState(session));
if (pageID !=3D -1) {
request.setAttribute ("pageID", new Integer (pageID));
- request.setAttribute ("homePageID", new Integer (pageID));
+ session.setAttribute ("homePageID", new Integer (pageID));
}
request.setAttribute ("jahiaSite", jahiaSite);
request.setAttribute ("jspSource", JahiaAdministration.JSP_PATH + =
"homepages/popup/homepagetool.jsp");
@@ -219,8 +220,18 @@
logger.debug ("Home Page ID : " + homePageDefID);
JahiaHomepageLink homePageLink =3D (JahiaHomepageLink)=
homePage;
session.setAttribute ("homePageID", new Integer (homeP=
ageLink.getPageID ()));
- session.setAttribute ("homePageLabel", JahiaPageBaseSe=
rvice.
- getInstance ().lookupContentPage(homePageLink.=
getPageID (),false).getPage(Jahia.getThreadParamBean()).getTitle ());
+ EntryLoadRequest loadRequest =3D new EntryLoadRequest(=
EntryLoadRequest.STAGED);
+ ArrayList locales =3D new ArrayList(2);
+ locales.add(0, LanguageCodeConverters.languageCodeToLo=
cale(ContentField.SHARED_LANGUAGE));
+ locales.add(jParams.getLocale());
+ loadRequest.setLocales(locales);
+ String s =3D JahiaPageBaseService.
+ getInstance()
+ .lookupContentPage(homePageLink.getPageID(), f=
alse)
+ .getPage(loadRequest, jParams.getOperationMode=
(), jParams.getUser())
+ .getTitle();
+ if(s=3D=3Dnull) s =3D "none";
+ session.setAttribute ("homePageLabel", s);
} else if (homePage.getType () =3D=3D HomepageTypes.HOMEPA=
GE_NEW) {
//
} else if (homePage.getType () =3D=3D HomepageTypes.HOMEPA=
GE_COPY) {
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/p=
roduction/ManageSiteProduction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/production/ManageSiteProduction.=
java&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/product=
ion/ManageSiteProduction.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/product=
ion/ManageSiteProduction.java Mon Mar 31 19:20:10 2008
@@ -160,6 +160,8 @@
String[] profiles =3D request.getParameter("profiles").split(",");
String[] aliases =3D request.getParameter("aliases").split(",");
String[] metadatas =3D request.getParameter("metadatas").split(","=
);
+ String[] workflows =3D request.getParameter("workflows").split(","=
);
+ String[] acls =3D request.getParameter("acls").split(",");
Properties settings =3D site.getSettings();
// remove old properties to avoid non usable properties in the db
try {
@@ -178,6 +180,8 @@
propertiesToBeRemoved.add(ImportExportBaseService.PRODUCTI=
ON_CONTEXTNAME_PROPERTY+s);
propertiesToBeRemoved.add(ImportExportBaseService.PRODUCTI=
ON_ALIAS_PROPERTY+s);
propertiesToBeRemoved.add(ImportExportBaseService.PRODUCTI=
ON_METADATA_PROPERTY+s);
+ propertiesToBeRemoved.add(ImportExportBaseService.PRODUCTI=
ON_WORKFLOW_PROPERTY+s);
+ propertiesToBeRemoved.add(ImportExportBaseService.PRODUCTI=
ON_ACL_PROPERTY+s);
settings.remove(ImportExportBaseService.PRODUCTION_USERNAM=
E_PROPERTY+s);
settings.remove(ImportExportBaseService.PRODUCTION_PASSWOR=
D_PROPERTY+s);
settings.remove(ImportExportBaseService.PRODUCTION_CRON_PR=
OPERTY+s);
@@ -187,6 +191,8 @@
settings.remove(ImportExportBaseService.PRODUCTION_CONTEXT=
NAME_PROPERTY+s);
settings.remove(ImportExportBaseService.PRODUCTION_ALIAS_P=
ROPERTY+s);
settings.remove(ImportExportBaseService.PRODUCTION_METADAT=
A_PROPERTY+s);
+ settings.remove(ImportExportBaseService.PRODUCTION_WORKFLO=
W_PROPERTY+s);
+ settings.remove(ImportExportBaseService.PRODUCTION_ACL_PRO=
PERTY+s);
}
ServicesRegistry registry =3D ServicesRegistry.getInstance();
registry.getJahiaSitesService().removeSiteProperties(site,prop=
ertiesToBeRemoved);
@@ -207,6 +213,8 @@
String profile =3D profiles[i];
String alias =3D aliases[i];
String metadata =3D metadatas[i];
+ String worfklow =3D workflows[i];
+ String acl =3D acls[i];
try {
Date date =3D simpleDateFormat.parse(cron);
// We have an hour:minutes specified instaed of a =
true cron expression so let's convert it
@@ -272,6 +280,8 @@
settings.setProperty(ImportExportBaseService.PRODUCTIO=
N_PROFILE_PROPERTY + i, profile);
settings.setProperty(ImportExportBaseService.PRODUCTIO=
N_ALIAS_PROPERTY+i,alias);
settings.setProperty(ImportExportBaseService.PRODUCTIO=
N_METADATA_PROPERTY+i,metadata);
+ settings.setProperty(ImportExportBaseService.PRODUCTIO=
N_WORKFLOW_PROPERTY+i,worfklow);
+ settings.setProperty(ImportExportBaseService.PRODUCTIO=
N_ACL_PROPERTY+i,acl);
} else {
String warningMsg =3D JahiaResourceBundle.getAdminReso=
urce("org.jahia.admin.productionManager.error.targetSite",
=
jParams, jParams.getLocale());
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/s=
earch/ManageSearch.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/admin/search/ManageSearch.java&rev=3D2=
0187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/search/=
ManageSearch.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/admin/search/=
ManageSearch.java Mon Mar 31 19:20:10 2008
@@ -265,7 +265,7 @@
request.setAttribute ("content-type", contentTypeStr);
=
// redirect!
- context.getRequestDispatcher (target).forward (request, respon=
se);
+ JahiaAdministration.doRedirect(request, response, session, tar=
get);
=
} catch (IOException ie) {
logger.error (ie.getMessage ());
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/ac=
tionmenus/GetTimeBasedPublishingState.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetTimeBasedPublishin=
gState.java&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetTimeBasedPublishingState.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetTimeBasedPublishingState.java Mon Mar 31 19:20:10 2008
@@ -32,11 +32,12 @@
import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.utils.xml.XmlUtils;
import org.jahia.data.fields.JahiaDateFieldUtil;
-import org.apache.commons.collections.FastHashMap;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionForm;
=
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletException;
@@ -62,7 +63,7 @@
org.apache.log4j.Logger.getLogger(GetTimeBasedPublishingState.=
class);
=
protected static final TimeBasedPublishingService tbpService =3D servi=
cesRegistry.getTimeBasedPublishingService();
- private static final Map imageMap =3D new FastHashMap(4);
+ private static final Map imageMap =3D new ConcurrentHashMap(4);
=
public ActionForward execute(final ActionMapping mapping,
final ActionForm form,
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/ac=
tionmenus/GetWorkflowState.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/actionmenus/GetWorkflowState.java=
&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetWorkflowState.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/actionme=
nus/GetWorkflowState.java Mon Mar 31 19:20:10 2008
@@ -28,7 +28,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
=
-import org.apache.commons.collections.FastHashMap;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -37,6 +36,8 @@
import org.jahia.params.ProcessingContext;
import org.jahia.services.workflow.WorkflowService;
=
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
/**
* Retrieves the workflow state of a ContentObject
*
@@ -48,7 +49,7 @@
org.apache.log4j.Logger.getLogger(GetWorkflowState.class);
=
private static final WorkflowService workflowService =3D servicesRegis=
try.getWorkflowService();
- private static final Map imageMap =3D new FastHashMap(16);
+ private static final Map imageMap =3D new ConcurrentHashMap(16);
=
public ActionForward execute(final ActionMapping mapping,
final ActionForm form,
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/ch=
at/chatAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/chat/chatAction.java&rev=3D20187&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/chat/cha=
tAction.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/chat/cha=
tAction.java Mon Mar 31 19:20:10 2008
@@ -32,6 +32,8 @@
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.registries.ServicesRegistry;
=
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
@@ -69,16 +71,16 @@
private static Map loggedUsers =3D Collections.synchronizedMap(new Has=
hMap(128));
=
// store the uptime long (keyed by userkey)
- private static Map UsersTimeUp =3D Collections.synchronizedMap(new Fas=
tHashMap(128));
+ private static Map UsersTimeUp =3D new ConcurrentHashMap(128);
=
// to store messages Vector for a specific user (keyed by userkey)
- private static Map userMessages =3D Collections.synchronizedMap(new Fa=
stHashMap(128));
+ private static Map userMessages =3D new ConcurrentHashMap(128);
=
// to store last site localisation of online users
- private static Map userSiteLoc =3D Collections.synchronizedMap(new Fas=
tHashMap(128));
+ private static Map userSiteLoc =3D new ConcurrentHashMap(128);
=
// to store last time seen for offline users with remaining messages (=
history)
- private static Map offlineUsers =3D Collections.synchronizedMap(new Fa=
stHashMap(128));
+ private static Map offlineUsers =3D new ConcurrentHashMap(128);
=
// jahia services
private static final JahiaUserManagerService userService =3D servicesR=
egistry.getJahiaUserManagerService();
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/se=
archhighlight/SearchHighlightAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/searchhighlight/SearchHighlightAc=
tion.java&rev=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/searchhi=
ghlight/SearchHighlightAction.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/searchhi=
ghlight/SearchHighlightAction.java Mon Mar 31 19:20:10 2008
@@ -179,7 +179,7 @@
=
ramDir =3D new RAMDirectory();
Analyzer analyzer =3D this.searchEngine.getSearchEngineFactory=
()
- .getAnalyzerManager().getDefaultAnalyzer();
+ .getAnalyzerManager().getAnalyzerByAlias("jahiaIndexer=
");
=
IndexWriter writer =3D new IndexWriter(ramDir, analyzer, true);
=
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/we=
bdav/SelecUnselectFile.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/webdav/SelecUnselectFile.java&rev=
=3D20187&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/webdav/S=
elecUnselectFile.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/webdav/S=
elecUnselectFile.java Mon Mar 31 19:20:10 2008
@@ -102,7 +102,7 @@
}
=
engineMap.put(fieldsEditCallingEngineName + ".theField", theFi=
eld);
- logger.info("selected File is: " + engineMap.get("filename"));
+ logger.debug("selected File is: " + engineMap.get("filename"));
session.setAttribute("jahia_session_engineMap", engineMap);
=
sendResponse(new String[]{"value"}, new String[] {responseValu=
e}, response);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/Jah=
iaErrorDisplay.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaErrorDisplay.java&rev=3D20187=
&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaErro=
rDisplay.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaErro=
rDisplay.java Mon Mar 31 19:20:10 2008
@@ -609,17 +609,7 @@
}
StringWriter msgBodyWriter =3D new StringWriter();
PrintWriter strOut =3D new PrintWriter(msgBodyWriter);
- Throwable innerThrowable =3D null;
- if (t instanceof ServletException) {
- ServletException se =3D (ServletException) t;
- innerThrowable =3D se.getRootCause();
- } else if (t instanceof JahiaException) {
- JahiaException je =3D (JahiaException) t;
- innerThrowable =3D je.getRootCause();
- } else if (t instanceof InvocationTargetException) {
- InvocationTargetException ite =3D (InvocationTargetException) =
t;
- innerThrowable =3D ite.getTargetException();
- }
+ Throwable innerThrowable =3D t.getCause();
if (innerThrowable !=3D null) {
String innerExceptionTrace =3D recursiveStackTraceToString(inn=
erThrowable, curDepth - 1);
msgBodyWriter.write(innerExceptionTrace);
@@ -639,17 +629,7 @@
return curDepth;
}
int newDepth =3D curDepth;
- Throwable innerThrowable =3D null;
- if (t instanceof ServletException) {
- ServletException se =3D (ServletException) t;
- innerThrowable =3D se.getRootCause();
- } else if (t instanceof JahiaException) {
- JahiaException je =3D (JahiaException) t;
- innerThrowable =3D je.getRootCause();
- } else if (t instanceof InvocationTargetException) {
- InvocationTargetException ite =3D (InvocationTargetException) =
t;
- innerThrowable =3D ite.getTargetException();
- }
+ Throwable innerThrowable =3D t.getCause();
if (innerThrowable !=3D null) {
newDepth =3D getNestedExceptionDepth(innerThrowable, curDepth =
+ 1);
}
@@ -668,17 +648,7 @@
if (t =3D=3D null) {
return null;
}
- Throwable innerThrowable =3D null;
- if (t instanceof ServletException) {
- ServletException se =3D (ServletException) t;
- innerThrowable =3D se.getRootCause();
- } else if (t instanceof JahiaEx