+ * The set of properties given act as a unique key. When the unique key changes, the collection
+ * values from the nested ResultMap are coalesced and the given {@link ResultHandler} is called. It is
+ * possible to embed several instances of this handler for deeply-nested ResultMap declarations.
+ *
+ * Use this instance as a regular {@link ResultHandler}, but with one big exception: call {@link #processLastResults()}
+ * after executing the SQL statement. Remove the groupBy attribute from the iBatis ResultMap
+ * declaration.
+ *
+ * Example iBatis 2.x (TODO migrate example to MyBatis 3.x):
+ *
+ RowHandler rowHandler = new RowHandler()
+ {
+ public void handleRow(Object valueObject)
+ {
+ // DO SOMETHING
+ }
+ };
+ RollupRowHandler rollupRowHandler = new RollupRowHandler(
+ new String[] {"auditEntryId"},
+ "auditValues",
+ rowHandler,
+ maxResults);
+
+ if (maxResults > 0)
+ {
+ // Calculate the maximum results required
+ int sqlMaxResults = (maxResults > 0 ? ((maxResults+1) * 20) : Integer.MAX_VALUE);
+
+ List rows = template.queryForList(SELECT_ENTRIES_WITH_VALUES, params, 0, sqlMaxResults);
+ for (AuditQueryResult row : rows)
+ {
+ rollupRowHandler.handleRow(row);
+ }
+ // Don't process last result:
+ // rollupRowHandler.processLastResults();
+ // The last result may be incomplete
+ }
+ else
+ {
+ template.queryWithRowHandler(SELECT_ENTRIES_WITH_VALUES, params, rollupRowHandler);
+ rollupRowHandler.processLastResults();
+ }
+ *
+ *
+ * This class is not thread-safe; use a new instance for each use.
+ *
+ * @author Derek Hulley, janv
+ * @since 4.0
+ */
+public class RollupResultHandler implements ResultHandler
+{
+ private final String[] keyProperties;
+ private final String collectionProperty;
+ private final ResultHandler resultHandler;
+ private final int maxResults;
+
+ private Object[] lastKeyValues;
+ private List
Checked conditions:
- * org.apache.xalan.xsltc.trax.TemplatesImpl and
- * org.springframework.core.SerializableTypeWrapper;
- * org.apache.commons.collections.functors.InvokerTransformer
- * org.apache.commons.collections.functors.InstantiateFactory
- * org.apache.commons.collections.functors.InstantiateTransformer
- * org.apache.commons.collections.functors.PrototypeCloneFactory
- * org.apache.commons.collections.functors.PrototypeSerializationFactory
- * org.apache.commons.collections.functors.WhileClosure
- * org.apache.commons.collections.functors.CloneTransformer
- * org.apache.commons.collections.functors.ForClosure
- */
-public class UnserializerValidatorBootstrap extends AbstractLifecycleBean
-{
-
- private static Log logger = LogFactory.getLog(UnserializerValidatorBootstrap.class);
-
- /** The name of the global enablement property. */
- public static final String PROPERTY_UNSERIALIZER_VALIDATOR_ENABLED = "unserializer.validator.enabled";
-
- private static final String ERR_UNEXPECTED_ERROR = "unserializer.validator.err.unexpectederror";
-
- // Bootstrap performed?
- private boolean bootstrapPerformed = false;
-
- private Properties properties = null;
- /**
- * @deprecated Was never used
- */
- public void setLog(boolean logEnabled)
- {
- // Ignore
- }
-
- /**
- * Determine if bootstrap was performed?
- *
- * @return true => bootstrap was performed
- */
- public boolean hasPerformedBootstrap()
- {
- return bootstrapPerformed;
- }
-
- public void setProperties(Properties properties)
- {
- this.properties = properties;
- }
-
- private boolean classInPath(String className)
- {
- try
- {
- Class.forName(className, false, this.getClass().getClassLoader());
-
- // it exists on the classpath
- return true;
- }
- catch (ClassNotFoundException e)
- {
-
- // it does not exist on the classpath
- return false;
- }
- }
-
- /**
- * Check if Java unserialize remote code execution is already fixed on this
- * commons collections version.
- *
- * @return
- */
- private boolean isCommonsCollectionsDeserializerFixed()
- {
-
- try
- {
- Class invokerTransformerClass = Class.forName(
- "org.apache.commons.collections.functors.InvokerTransformer", true, this
- .getClass().getClassLoader());
-
- if (invokerTransformerClass != null)
- {
- Constructor invokerTransformerConstructor = invokerTransformerClass
- .getConstructor(String.class, Class[].class, Object[].class);
-
- Object invokerTransformerInstance = invokerTransformerConstructor.newInstance(null,
- null, null);
-
- ObjectOutputStream objectOut = null;
- ByteArrayOutputStream byteOut = null;
- try
- {
- // Write the object out to a byte array
- byteOut = new ByteArrayOutputStream();
- objectOut = new ObjectOutputStream(byteOut);
- objectOut.writeObject(invokerTransformerInstance);
- objectOut.flush();
- }
- catch (UnsupportedOperationException e)
- {
- // Expected: Serialization support is disabled for security
- // reasons.
- return true;
- }
- catch (IOException e)
- {
- throw new AlfrescoRuntimeException(ERR_UNEXPECTED_ERROR, e);
- }
- finally
- {
- if (objectOut != null)
- {
- try
- {
- objectOut.close();
- }
- catch (Throwable e)
- {
- }
- }
- if (byteOut != null)
- {
- try
- {
- byteOut.close();
- }
- catch (Throwable e)
- {
- }
- }
- }
- }
- }
- catch (SecurityException e)
- {
- // This is and expected, acceptable exception that we can ignore.
- }
- catch (ClassNotFoundException e)
- {
- // This is and expected, acceptable exception that we can ignore.
- }
- catch (InstantiationException e)
- {
- // This is and expected, acceptable exception that we can ignore.
- }
- catch (IllegalAccessException e)
- {
- // This is and expected, acceptable exception that we can ignore.
- }
- catch (NoSuchMethodException e)
- {
- throw new AlfrescoRuntimeException(ERR_UNEXPECTED_ERROR, e);
- }
- catch (IllegalArgumentException e)
- {
- throw new AlfrescoRuntimeException(ERR_UNEXPECTED_ERROR, e);
- }
- catch (InvocationTargetException e)
- {
- // This is and expected, acceptable exception that we can ignore.
- }
-
- return false;
- }
-
- private void validate()
- {
- if (classInPath("org.apache.xalan.xsltc.trax.TemplatesImpl") && classInPath("org.springframework.core.SerializableTypeWrapper"))
- {
- throw new AlfrescoRuntimeException(
- "Bootstrap failed: both org.apache.xalan.xsltc.trax.TemplatesImpl and org.springframework.core.SerializableTypeWrapper appear at the same time in classpath ");
- }
-
- // Check if Java unserialize remote code execution is available and not
- // fixed on this commons collections
- if ((classInPath("org.apache.commons.collections.functors.InvokerTransformer")
- || classInPath("org.apache.commons.collections.functors.InstantiateFactory")
- || classInPath("org.apache.commons.collections.functors.InstantiateTransformer")
- || classInPath("org.apache.commons.collections.functors.PrototypeCloneFactory")
- || classInPath("org.apache.commons.collections.functors.PrototypeSerializationFactory")
- || classInPath("org.apache.commons.collections.functors.WhileClosure")
- || classInPath("org.apache.commons.collections.functors.CloneTransformer") || classInPath("org.apache.commons.collections.functors.ForClosure"))
- && !isCommonsCollectionsDeserializerFixed())
- {
- throw new AlfrescoRuntimeException(
- "Bootstrap failed: org.apache.commons.collections.functors.* unsafe serialization classes found in classpath.");
- }
- }
-
- private boolean isUnserializerValidatorEnabled()
- {
- return getBooleanProperty(PROPERTY_UNSERIALIZER_VALIDATOR_ENABLED, true);
- }
-
- private boolean getBooleanProperty(String name, boolean defaultValue)
- {
- boolean value = defaultValue;
- if (properties != null)
- {
- String property = properties.getProperty(name);
- if (property != null)
- {
- value = !property.trim().equalsIgnoreCase("false");
- }
- }
- return value;
- }
-
- /**
- * Bootstrap unserializer validator.
- */
- public void bootstrap()
- {
- if (isUnserializerValidatorEnabled())
- {
- validate();
- }
- else
- {
- logger.warn("Unserializer validator is disabled");
- }
-
- // a bootstrap was performed
- bootstrapPerformed = true;
- }
-
- @Override
- protected void onBootstrap(ApplicationEvent event)
- {
- bootstrap();
- }
-
- @Override
- protected void onShutdown(ApplicationEvent event)
- {
- // NOOP
- }
-
-}
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java b/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
index 6543f4ae5f..49aa509b3b 100644
--- a/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
+++ b/src/main/java/org/alfresco/repo/admin/patch/impl/CalendarAllDayEventDatesCorrectingPatch.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.admin.patch.impl;
import java.util.Calendar;
diff --git a/src/main/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java b/src/main/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java
deleted file mode 100644
index 462441e8d5..0000000000
--- a/src/main/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.admin.patch.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
-import java.sql.Savepoint;
-import java.util.Date;
-import java.util.List;
-
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.domain.control.ControlDAO;
-import org.alfresco.repo.domain.patch.PatchDAO;
-import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.util.Pair;
-import org.alfresco.util.TempFileProvider;
-import org.springframework.extensions.surf.util.I18NUtil;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-
-/**
- * Checks that all names do not end with ' ' or '.'
- *
- * @author David Caruana
- */
-public class LinkNodeFileExtensionPatch extends AbstractPatch
-{
- private static final String MSG_SUCCESS = "patch.linkNodeExtension.result";
- private static final String MSG_REWRITTEN = "patch.linkNodeExtension.rewritten";
- private static final String ERR_UNABLE_TO_FIX = "patch.linkNodeExtension.err.unable_to_fix";
-
- private PatchDAO patchDAO;
- private ControlDAO controlDAO;
- private NodeService nodeService;
-
- /**
- * Default constructor
- */
- public LinkNodeFileExtensionPatch()
- {
- }
-
- public void setPatchDAO(PatchDAO patchDAO)
- {
- this.patchDAO = patchDAO;
- }
-
- public void setControlDAO(ControlDAO controlDAO)
- {
- this.controlDAO = controlDAO;
- }
-
- public void setNodeService(NodeService nodeService)
- {
- this.nodeService = nodeService;
- }
-
- @Override
- protected void checkProperties()
- {
- super.checkProperties();
- checkPropertyNotNull(patchDAO, "patchDAO");
- checkPropertyNotNull(nodeService, "nodeService");
- }
-
- @Override
- protected String applyInternal() throws Exception
- {
- LinkNodeFileExtensionHelper helper = new LinkNodeFileExtensionHelper();
-
- try
- {
- return helper.fixNames();
- }
- finally
- {
- helper.closeWriter();
- }
- }
-
- private class LinkNodeFileExtensionHelper extends HibernateDaoSupport
- {
- private File logFile;
- private FileChannel channel;
-
- private LinkNodeFileExtensionHelper() throws IOException
- {
- // Open a log file
- File tempDir = TempFileProvider.getLongLifeTempDir("patches");
- logFile = new File(tempDir, "LinkNodeExtensionPatch.log");
-
- RandomAccessFile outputFile = new RandomAccessFile(logFile, "rw");
- channel = outputFile.getChannel();
-
- // Append to the end of the file
-
- channel.position(channel.size());
-
- writeLine("").writeLine("");
- writeLine("LinkNodeExtensionPatch executing on " + new Date());
- }
-
- private LinkNodeFileExtensionHelper write(Object obj) throws IOException
- {
- channel.write(ByteBuffer.wrap(obj.toString().getBytes()));
- return this;
- }
- private LinkNodeFileExtensionHelper writeLine(Object obj) throws IOException
- {
- write(obj);
- write("\n");
- return this;
- }
- private void closeWriter()
- {
- try { channel.close(); } catch (Throwable e) {}
- }
-
- public String fixNames() throws Exception
- {
- List> names = patchDAO.getNodesOfTypeWithNamePattern(ContentModel.TYPE_LINK, "%.lnk");
-
- int updated = 0;
- for (Pair pair : names)
- {
- NodeRef nodeRef = pair.getFirst();
- String name = pair.getSecond();
- // Update the name string, replace '.lnk' with '.url'
- String updatedName = name.substring(0, name.length() - 4) + ".url";
- int idx = 0;
- boolean applied = false;
- while (!applied && idx < 10)
- {
- Savepoint savepoint = controlDAO.createSavepoint("LinkNodeFileExtensionsFix");
- try
- {
- nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, updatedName);
- controlDAO.releaseSavepoint(savepoint);
- applied = true;
- }
- catch(DuplicateChildNodeNameException e)
- {
- controlDAO.rollbackToSavepoint(savepoint);
- idx++;
- updatedName += "_" + idx;
- }
- }
- if (applied)
- {
- writeLine(I18NUtil.getMessage(MSG_REWRITTEN, name ,updatedName));
- }
- else
- {
- writeLine(I18NUtil.getMessage(ERR_UNABLE_TO_FIX, name, updatedName));
- }
- updated++;
- }
-
- String msg = I18NUtil.getMessage(MSG_SUCCESS, updated, logFile);
- return msg;
- }
- }
-}
diff --git a/src/main/java/org/alfresco/repo/cache/DefaultCacheProvider.java b/src/main/java/org/alfresco/repo/cache/DefaultCacheProvider.java
deleted file mode 100644
index e7fa8f5701..0000000000
--- a/src/main/java/org/alfresco/repo/cache/DefaultCacheProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.cache;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hibernate.cache.Cache;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.CacheProvider;
-import org.hibernate.cache.Timestamper;
-
-/**
- * A simple {@link CacheProvider} that allows Hibernate to create {@link DefaultSimpleCache}
- * based caches.
- *
- * @author Matt Ward
- */
-public class DefaultCacheProvider implements CacheProvider
-{
- private final static Log log = LogFactory.getLog(DefaultCacheProvider.class);
- // TODO: setup in spring (SystemPropertiesSetterBean)
- private int defaultMaxItems = 500;
-
- @Override
- public Cache buildCache(String regionName, Properties properties) throws CacheException
- {
- if (log.isDebugEnabled())
- {
- log.debug("building cache for regionName=" + regionName + ", with properties: " + properties);
- }
- DefaultSimpleCache cache = new DefaultSimpleCache(defaultMaxItems, null);
- Cache hibCache = new HibernateSimpleCacheAdapter(cache, regionName);
- return hibCache;
- }
-
- @Override
- public long nextTimestamp()
- {
- return Timestamper.next();
- }
-
- @Override
- public void start(Properties properties) throws CacheException
- {
- log.debug("Starting cache provider");
- }
-
- @Override
- public void stop()
- {
- log.debug("Stopping cache provider");
- }
-
- @Override
- public boolean isMinimalPutsEnabledByDefault()
- {
- return false;
- }
-
-}
diff --git a/src/main/java/org/alfresco/repo/cache/HibernateSimpleCacheAdapter.java b/src/main/java/org/alfresco/repo/cache/HibernateSimpleCacheAdapter.java
deleted file mode 100644
index 52045550f2..0000000000
--- a/src/main/java/org/alfresco/repo/cache/HibernateSimpleCacheAdapter.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.cache;
-
-import java.io.Serializable;
-import java.util.Map;
-
-import org.hibernate.cache.Cache;
-import org.hibernate.cache.CacheException;
-import org.hibernate.cache.Timestamper;
-
-/**
- * Adapts a {@link SimpleCache} instance for use as a Hibernate {@link Cache}.
- *
- * @author Matt Ward
- */
-public class HibernateSimpleCacheAdapter implements Cache
-{
- private final SimpleCache cache;
- private final String regionName;
-
- /**
- * Adapt a
- * @param regionName String
- */
- public HibernateSimpleCacheAdapter(SimpleCache cache, String regionName)
- {
- this.cache = cache;
- this.regionName = regionName;
- }
-
- @Override
- public Object read(Object key) throws CacheException
- {
- return cache.get(serializable(key));
- }
-
- @Override
- public Object get(Object key) throws CacheException
- {
- return cache.get(serializable(key));
- }
-
- @Override
- public void put(Object key, Object value) throws CacheException
- {
- cache.put(serializable(key), value);
- }
-
- @Override
- public void update(Object key, Object value) throws CacheException
- {
- cache.put(serializable(key), value);
- }
-
- @Override
- public void remove(Object key) throws CacheException
- {
- cache.remove(serializable(key));
- }
-
- @Override
- public void clear() throws CacheException
- {
- cache.clear();
- }
-
- @Override
- public void destroy() throws CacheException
- {
- // NoOp
- }
-
- @Override
- public void lock(Object key) throws CacheException
- {
- // NoOp
- }
-
- @Override
- public void unlock(Object key) throws CacheException
- {
- // NoOp
- }
-
- @Override
- public long nextTimestamp()
- {
- return Timestamper.next();
- }
-
- @Override
- public int getTimeout()
- {
- return Timestamper.ONE_MS * 60000; // 1 minute
- }
-
- @Override
- public String getRegionName()
- {
- return regionName;
- }
-
- @Override
- public long getSizeInMemory()
- {
- return -1;
- }
-
- @Override
- public long getElementCountInMemory()
- {
- return -1;
- }
-
- @Override
- public long getElementCountOnDisk()
- {
- return 0;
- }
-
- @Override
- public Map toMap()
- {
- throw new UnsupportedOperationException();
- }
-
- private Serializable serializable(Object obj)
- {
- if (!(obj instanceof Serializable))
- {
- throw new IllegalArgumentException("Object is not Serializable, class=" + obj.getClass().getName());
- }
- return (Serializable) obj;
- }
-
-}
diff --git a/src/main/java/org/alfresco/repo/cache/TransactionalCache.java b/src/main/java/org/alfresco/repo/cache/TransactionalCache.java
index 7fc9d6f63e..043ad72c1d 100644
--- a/src/main/java/org/alfresco/repo/cache/TransactionalCache.java
+++ b/src/main/java/org/alfresco/repo/cache/TransactionalCache.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.cache;
import java.io.Serializable;
@@ -45,9 +45,10 @@ import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
/**
- * A 2-level cache that mainains both a transaction-local cache and
+ * A 2-level cache that maintains both a transaction-local cache and
* wraps a non-transactional (shared) cache.
*
* It uses the sharedSimpleCache for it's per-transaction
@@ -58,7 +59,7 @@ import org.springframework.beans.factory.InitializingBean;
* virtually no overhead when running out-of-transaction.
*
* The first phase of the commit ensures that any values written to the cache in the
- * current transaction are not already superceded by values in the shared cache. In
+ * current transaction are not already superseded by values in the shared cache. In
* this case, the transaction is failed for concurrency reasons and will have to retry.
* The second phase occurs post-commit. We are sure that the transaction committed
* correctly, but things may have changed in the cache between the commit and post-commit.
@@ -273,7 +274,12 @@ public class TransactionalCache
// ensure that we get the transaction callbacks as we have bound the unique
// transactional caches to a common manager
- AlfrescoTransactionSupport.bindListener(this);
+ // The synchronizations are not available after the txn is committed/rolled back
+ // the resources are still stored in org.alfresco.util.transaction.TransactionSupportUtil
+ if (TransactionSynchronizationManager.isSynchronizationActive())
+ {
+ AlfrescoTransactionSupport.bindListener(this);
+ }
AlfrescoTransactionSupport.bindResource(resourceKeyTxnData, data);
}
return data;
@@ -738,17 +744,17 @@ public class TransactionalCache
// data by clearing the shared cache after the transaction. Also, the
// shared cache needs to be ignored for the rest of the transaction.
txnData.isClearOn = true;
- if (!txnData.haveIssuedFullWarning)
+ if (!txnData.haveIssuedFullWarning)
{
- if (logger.isInfoEnabled())
- {
- Exception e = new Exception("Stack: ");
- logger.info("Transactional update cache '" + name + "' is full (" + maxCacheSize + ").", e);
- }
- else if (logger.isWarnEnabled())
- {
- logger.warn("Transactional update cache '" + name + "' is full (" + maxCacheSize + ").");
- }
+ if (logger.isInfoEnabled())
+ {
+ Exception e = new Exception("Stack: ");
+ logger.info("Transactional update cache '" + name + "' is full (" + maxCacheSize + ").", e);
+ }
+ else if (logger.isWarnEnabled())
+ {
+ logger.warn("Transactional update cache '" + name + "' is full (" + maxCacheSize + ").");
+ }
txnData.haveIssuedFullWarning = true;
}
}
@@ -848,17 +854,17 @@ public class TransactionalCache
// data by clearing the shared cache after the transaction. Also, the
// shared cache needs to be ignored for the rest of the transaction.
txnData.isClearOn = true;
- if (!txnData.haveIssuedFullWarning)
+ if (!txnData.haveIssuedFullWarning)
{
- if (logger.isInfoEnabled())
- {
- Exception e = new Exception("Stack: ");
- logger.info("Transactional removal cache '" + name + "' is full (" + maxCacheSize + ").", e);
- }
- else if (logger.isWarnEnabled())
- {
- logger.warn("Transactional removal cache '" + name + "' is full (" + maxCacheSize + ").");
- }
+ if (logger.isInfoEnabled())
+ {
+ Exception e = new Exception("Stack: ");
+ logger.info("Transactional removal cache '" + name + "' is full (" + maxCacheSize + ").", e);
+ }
+ else if (logger.isWarnEnabled())
+ {
+ logger.warn("Transactional removal cache '" + name + "' is full (" + maxCacheSize + ").");
+ }
txnData.haveIssuedFullWarning = true;
}
}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DB2Dialect.java b/src/main/java/org/alfresco/repo/domain/dialect/DB2Dialect.java
new file mode 100644
index 0000000000..aa8036ffeb
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/DB2Dialect.java
@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Types;
+
+public class DB2Dialect extends Dialect
+{
+ public DB2Dialect()
+ {
+ super();
+ registerColumnType( Types.BIT, "smallint" );
+ registerColumnType( Types.BIGINT, "bigint" );
+ registerColumnType( Types.SMALLINT, "smallint" );
+ registerColumnType( Types.TINYINT, "smallint" );
+ registerColumnType( Types.INTEGER, "integer" );
+ registerColumnType( Types.CHAR, "char(1)" );
+ registerColumnType( Types.VARCHAR, "varchar($l)" );
+ registerColumnType( Types.FLOAT, "float" );
+ registerColumnType( Types.DOUBLE, "double" );
+ registerColumnType( Types.DATE, "date" );
+ registerColumnType( Types.TIME, "time" );
+ registerColumnType( Types.TIMESTAMP, "timestamp" );
+ registerColumnType( Types.VARBINARY, "varchar($l) for bit data" );
+ registerColumnType( Types.NUMERIC, "numeric($p,$s)" );
+ registerColumnType( Types.BLOB, "blob($l)" );
+ registerColumnType( Types.CLOB, "clob($l)" );
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java b/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java
new file mode 100644
index 0000000000..45d307933f
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/Dialect.java
@@ -0,0 +1,71 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+/**
+ * Class partially copied from patched hibernate 3.2.6
+ *
+ * @since 6.0
+ */
+public class Dialect
+{
+ private final TypeNames typeNames = new TypeNames();
+
+ protected Dialect()
+ {
+ }
+
+ public String toString()
+ {
+ return getClass().getName();
+ }
+
+ /**
+ * Subclasses register a type name for the given type code and maximum
+ * column length. $l in the type name with be replaced by the
+ * column length (if appropriate).
+ *
+ * @param code The {@link java.sql.Types} typecode
+ * @param capacity The maximum length of database type
+ * @param name The database type name
+ */
+ protected void registerColumnType(int code, int capacity, String name)
+ {
+ typeNames.put( code, capacity, name );
+ }
+
+ /**
+ * Subclasses register a type name for the given type code. $l in
+ * the type name with be replaced by the column length (if appropriate).
+ *
+ * @param code The {@link java.sql.Types} typecode
+ * @param name The database type name
+ */
+ protected void registerColumnType(int code, String name)
+ {
+ typeNames.put( code, name );
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
new file mode 100644
index 0000000000..bfb746b98b
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
@@ -0,0 +1,165 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.alfresco.error.AlfrescoRuntimeException;
+
+/**
+ * A factory for generating Dialect instances.
+ *
+ * This class is an Alfresco-specific version of the Hibernate class with the same name.
+ *
+ * @author Steve Ebersole
+ * @author Alfresco
+ * @since 6.0
+ */
+public class DialectFactory
+{
+ /**
+ * Builds an appropriate Dialect instance.
+ *
+ * The JDBC driver, the database name and version
+ * (obtained from connection metadata) are used to make the determination.
+ *
+ * An exception is thrown if a dialect was not explicitly set and the database name is not known.
+ *
+
+ * @param databaseName The name of the database product (obtained from metadata).
+ * @param databaseMajorVersion The major version of the database product (obtained from metadata).
+ * @param driverName THe name of the JDBC driver
+ *
+ * @return The appropriate dialect.
+ */
+ public static Dialect buildDialect(String databaseName, int databaseMajorVersion, String driverName)
+ {
+ if ( databaseName == null ) {
+ throw new IllegalArgumentException("Database name must be explicitly set");
+ }
+
+ DatabaseDialectMapper mapper = MAPPERS.get(driverName) != null ?
+ MAPPERS.get(driverName) : MAPPERS.get(databaseName);
+ if ( mapper == null )
+ {
+ throw new IllegalArgumentException( "Dialect must be explicitly set for database: " + databaseName );
+ }
+
+ String dialectName = mapper.getDialectClass( databaseMajorVersion );
+ return buildDialect( dialectName );
+ }
+
+ /**
+ * Returns a dialect instance given the name of the class to use.
+ *
+ * @param dialectName The name of the dialect class.
+ *
+ * @return The dialect instance.
+ */
+ public static Dialect buildDialect(String dialectName)
+ {
+ try
+ {
+ return ( Dialect ) Class.forName( dialectName ).newInstance();
+ }
+ catch ( ClassNotFoundException cnfe )
+ {
+ throw new IllegalArgumentException( "Dialect class not found: " + dialectName );
+ }
+ catch ( Exception e )
+ {
+ throw new AlfrescoRuntimeException( "Could not instantiate dialect class", e );
+ }
+ }
+
+ /**
+ * For a given database product name, instances of
+ * DatabaseDialectMapper know which Dialect to use for different versions.
+ */
+ public static interface DatabaseDialectMapper {
+ public String getDialectClass(int majorVersion);
+ }
+
+ /**
+ * A simple DatabaseDialectMapper for dialects which are independent
+ * of the underlying database product version.
+ */
+ public static class VersionInsensitiveMapper implements DatabaseDialectMapper {
+ private String dialectClassName;
+
+ public VersionInsensitiveMapper(String dialectClassName) {
+ this.dialectClassName = dialectClassName;
+ }
+
+ public String getDialectClass(int majorVersion) {
+ return dialectClassName;
+ }
+ }
+
+ // TODO : this is the stuff it'd be nice to move to a properties file or some other easily user-editable place
+ private static final Map MAPPERS = new HashMap();
+ static {
+ // detectors...
+ MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.PostgreSQLDialect" ) );
+
+ MAPPERS.put( "DB2/NT", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/LINUX", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/6000", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/HPUX", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/SUN", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/LINUX390", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/AIX64", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/NT",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/NT64",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2 UDP",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/LINUX",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/LINUX390",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/LINUXZ64",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/400 SQL",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/6000",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2 UDB iSeries",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/AIX64",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/HPUX",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/HP64",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/SUN",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/SUN64",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/PTX",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/2",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+ MAPPERS.put( "DB2/LINUXX8664",new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ));
+
+ MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) );
+ MAPPERS.put( "DB2/NT64", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "DB2/LINUX", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.DB2Dialect" ) );
+ MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );
+ MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );
+ MAPPERS.put( "Oracle", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.Oracle9Dialect" ) );
+
+ // MariaDB is distinguished by driver name
+ MAPPERS.put( "MariaDB connector/J", new VersionInsensitiveMapper("org.alfresco.repo.domain.dialect.MariaDBDialect"));
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java
new file mode 100644
index 0000000000..b2cd7be819
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactoryBean.java
@@ -0,0 +1,88 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+
+/**
+ * Factory for the DB dialect. Allows dialect detection logic to be centralized and the dialect to be injected
+ * where required as a singleton from the container.
+ *
+ * @author dward
+ * @since 6.0
+ */
+public class DialectFactoryBean implements FactoryBean
+{
+ private DataSource dataSource;
+
+ public void setDataSource(DataSource dataSource)
+ {
+ this.dataSource = dataSource;
+ }
+
+ @Override
+ public Dialect getObject() throws SQLException
+ {
+ Connection con = null;
+ try
+ {
+ // make sure that we AUTO-COMMIT
+ con = DataSourceUtils.getConnection(dataSource);
+ con.setAutoCommit(true);
+ DatabaseMetaData meta = con.getMetaData();
+ Dialect dialect = DialectFactory.buildDialect(meta.getDatabaseProductName(), meta.getDatabaseMajorVersion(), meta.getDriverName());
+ return dialect;
+ }
+ finally
+ {
+ try
+ {
+ con.close();
+ }
+ catch (Exception e)
+ {
+ }
+ }
+ }
+
+ @Override
+ public Class getObjectType()
+ {
+ return Dialect.class;
+ }
+
+ @Override
+ public boolean isSingleton()
+ {
+ return true;
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMariaDBDialect.java b/src/main/java/org/alfresco/repo/domain/dialect/MariaDBDialect.java
similarity index 84%
rename from src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMariaDBDialect.java
rename to src/main/java/org/alfresco/repo/domain/dialect/MariaDBDialect.java
index 9361529774..4ffa61b5c6 100644
--- a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMariaDBDialect.java
+++ b/src/main/java/org/alfresco/repo/domain/dialect/MariaDBDialect.java
@@ -23,17 +23,15 @@
* along with Alfresco. If not, see .
* #L%
*/
-package org.alfresco.repo.domain.hibernate.dialect;
-
-
-import org.hibernate.dialect.MySQLInnoDBDialect;
+package org.alfresco.repo.domain.dialect;
/**
* @author eknizat
+ * @since 6.0
*/
-public class AlfrescoMariaDBDialect extends MySQLInnoDBDialect
+public class MariaDBDialect extends MySQLInnoDBDialect
{
- public AlfrescoMariaDBDialect()
+ public MariaDBDialect()
{
super();
}
diff --git a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java b/src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
similarity index 82%
rename from src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java
rename to src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
index 7927b6ee41..cb0add228f 100644
--- a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoMySQLClusterNDBDialect.java
+++ b/src/main/java/org/alfresco/repo/domain/dialect/MySQLClusterNDBDialect.java
@@ -23,11 +23,10 @@
* along with Alfresco. If not, see .
* #L%
*/
-package org.alfresco.repo.domain.hibernate.dialect;
+package org.alfresco.repo.domain.dialect;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.dialect.MySQLInnoDBDialect;
/**
* MySQL Cluster NDB specific DAO overrides
@@ -43,19 +42,14 @@ import org.hibernate.dialect.MySQLInnoDBDialect;
*
*/
//note: *not* a dialect of InnoDB but, for now, extends here so that we can override those scripts
-public class AlfrescoMySQLClusterNDBDialect extends MySQLInnoDBDialect
+public class MySQLClusterNDBDialect extends MySQLInnoDBDialect
{
- protected Log logger = LogFactory.getLog(AlfrescoMySQLClusterNDBDialect.class);
+ protected Log logger = LogFactory.getLog(MySQLClusterNDBDialect.class);
- public AlfrescoMySQLClusterNDBDialect()
+ public MySQLClusterNDBDialect()
{
super();
logger.error("Using NDB with Alfresco is experimental and unsupported (do not use for live/prod envs) !");
}
-
- public String getTableTypeString() {
- return " engine=NDB";
- }
-
}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java b/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java
new file mode 100644
index 0000000000..52adefd39d
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/MySQLInnoDBDialect.java
@@ -0,0 +1,66 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Types;
+
+/**
+ * @since 6.0
+ */
+public class MySQLInnoDBDialect extends Dialect
+{
+ public MySQLInnoDBDialect()
+ {
+ super();
+ registerColumnType( Types.BIT, "bit" );
+ registerColumnType( Types.BIGINT, "bigint" );
+ registerColumnType( Types.SMALLINT, "smallint" );
+ registerColumnType( Types.TINYINT, "tinyint" );
+ registerColumnType( Types.INTEGER, "integer" );
+ registerColumnType( Types.CHAR, "char(1)" );
+ registerColumnType( Types.FLOAT, "float" );
+ registerColumnType( Types.DOUBLE, "double precision" );
+ registerColumnType( Types.DATE, "date" );
+ registerColumnType( Types.TIME, "time" );
+ registerColumnType( Types.TIMESTAMP, "datetime" );
+ registerColumnType( Types.VARBINARY, "longblob" );
+ registerColumnType( Types.VARBINARY, 16777215, "mediumblob" );
+ registerColumnType( Types.VARBINARY, 65535, "blob" );
+ registerColumnType( Types.VARBINARY, 255, "tinyblob" );
+ registerColumnType( Types.NUMERIC, "decimal($p,$s)" );
+ registerColumnType( Types.BLOB, "longblob" );
+ registerColumnType( Types.BLOB, 16777215, "mediumblob" );
+ registerColumnType( Types.BLOB, 65535, "blob" );
+ registerColumnType( Types.CLOB, "longtext" );
+ registerColumnType( Types.CLOB, 16777215, "mediumtext" );
+ registerColumnType( Types.CLOB, 65535, "text" );
+
+ registerColumnType( Types.VARCHAR, "longtext" );
+ registerColumnType( Types.VARCHAR, 16777215, "mediumtext" );
+ registerColumnType( Types.VARCHAR, 65535, "text" );
+ registerColumnType( Types.VARCHAR, 255, "varchar($l)" );
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java b/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java
new file mode 100644
index 0000000000..ba512c3bf9
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/Oracle9Dialect.java
@@ -0,0 +1,65 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Types;
+
+/**
+ * Does away with the deprecated LONG datatype. This extends the deprecated
+ * Oracle9Dialect for good reason: Hibernate ceased supporting
+ * right outer join in the Oracle9iDialect.
+ *
+ * @since 6.0
+ */
+public class Oracle9Dialect extends Dialect
+{
+ public Oracle9Dialect()
+ {
+ super();
+ registerColumnType( Types.BIT, "number(1,0)" );
+ registerColumnType( Types.BIGINT, "number(19,0)" );
+ registerColumnType( Types.SMALLINT, "number(5,0)" );
+ registerColumnType( Types.TINYINT, "number(3,0)" );
+ registerColumnType( Types.INTEGER, "number(10,0)" );
+ registerColumnType( Types.CHAR, "char(1 char)" );
+ registerColumnType( Types.VARCHAR, 4000, "varchar2($l char)" );
+ registerColumnType( Types.VARCHAR, "long" );
+ registerColumnType( Types.FLOAT, "float" );
+ registerColumnType( Types.DOUBLE, "double precision" );
+ registerColumnType( Types.DATE, "date" );
+ registerColumnType( Types.TIME, "date" );
+ registerColumnType( Types.TIMESTAMP, "timestamp" );
+ registerColumnType( Types.VARBINARY, 2000, "raw($l)" );
+ registerColumnType( Types.VARBINARY, "long raw" );
+ registerColumnType( Types.NUMERIC, "number($p,$s)" );
+ registerColumnType( Types.DECIMAL, "number($p,$s)" );
+ registerColumnType( Types.BLOB, "blob" );
+ registerColumnType( Types.CLOB, "clob" );
+
+ registerColumnType( Types.VARBINARY, "blob");
+ registerColumnType( Types.NVARCHAR, 4000, "nvarchar2($l)");
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java b/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java
new file mode 100644
index 0000000000..98cfc8434f
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/PostgreSQLDialect.java
@@ -0,0 +1,55 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Types;
+
+/**
+ * @since 6.0
+ */
+public class PostgreSQLDialect extends Dialect
+{
+ public PostgreSQLDialect()
+ {
+ super();
+ registerColumnType( Types.BIT, "bool" );
+ registerColumnType( Types.BIGINT, "int8" );
+ registerColumnType( Types.SMALLINT, "int2" );
+ registerColumnType( Types.TINYINT, "int2" );
+ registerColumnType( Types.INTEGER, "int4" );
+ registerColumnType( Types.CHAR, "char(1)" );
+ registerColumnType( Types.VARCHAR, "varchar($l)" );
+ registerColumnType( Types.FLOAT, "float4" );
+ registerColumnType( Types.DOUBLE, "float8" );
+ registerColumnType( Types.DATE, "date" );
+ registerColumnType( Types.TIME, "time" );
+ registerColumnType( Types.TIMESTAMP, "timestamp" );
+ registerColumnType( Types.VARBINARY, "bytea" );
+ registerColumnType( Types.CLOB, "text" );
+ registerColumnType( Types.BLOB, "oid" );
+ registerColumnType( Types.NUMERIC, "numeric($p, $s)" );
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java b/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java
new file mode 100644
index 0000000000..de6534fab3
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/SQLServerDialect.java
@@ -0,0 +1,62 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.sql.Types;
+
+/**
+ * @since 6.0
+ */
+public class SQLServerDialect extends Dialect
+{
+ public SQLServerDialect()
+ {
+ super();
+ registerColumnType( Types.BIT, "tinyint" ); //Sybase BIT type does not support null values
+ registerColumnType( Types.BIGINT, "numeric(19,0)" );
+ registerColumnType( Types.SMALLINT, "smallint" );
+ registerColumnType( Types.TINYINT, "tinyint" );
+ registerColumnType( Types.INTEGER, "int" );
+ registerColumnType( Types.CHAR, "char(1)" );
+ registerColumnType( Types.VARCHAR, "varchar($l)" );
+ registerColumnType( Types.FLOAT, "float" );
+ registerColumnType( Types.DOUBLE, "double precision" );
+ registerColumnType( Types.DATE, "datetime" );
+ registerColumnType( Types.TIME, "datetime" );
+ registerColumnType( Types.TIMESTAMP, "datetime" );
+ registerColumnType( Types.VARBINARY, "varbinary($l)" );
+ registerColumnType( Types.NUMERIC, "numeric($p,$s)" );
+ registerColumnType( Types.BLOB, "image" );
+ registerColumnType( Types.CLOB, "text" );
+
+ registerColumnType( Types.VARBINARY, "image" );
+ registerColumnType( Types.VARBINARY, 8000, "varbinary($l)" );
+
+ registerColumnType( Types.VARCHAR, "nvarchar($l)" );
+ registerColumnType( Types.CLOB, "nvarchar(max)");
+ }
+
+}
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java b/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java
new file mode 100644
index 0000000000..a6f7c083f2
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/domain/dialect/TypeNames.java
@@ -0,0 +1,163 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.domain.dialect;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.TreeMap;
+import java.util.Iterator;
+
+/**
+ * This class maps a type to names. Associations
+ * may be marked with a capacity. Calling the get()
+ * method with a type and actual size n will return
+ * the associated name with smallest capacity >= n,
+ * if available and an unmarked default type otherwise.
+ * Eg, setting
+ *
+ *
+ * Class copied from patched hibernate 3.2.6
+ * @since 6.0
+ */
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class TypeNames {
+
+ private HashMap weighted = new HashMap();
+ private HashMap defaults = new HashMap();
+
+ /**
+ * get default type name for specified type
+ * @param typecode the type key
+ * @return the default type name associated with specified key
+ */
+ public String get(int typecode) throws IllegalArgumentException
+ {
+ String result = (String) defaults.get( new Integer(typecode) );
+ if (result == null)
+ {
+ throw new IllegalArgumentException("No Dialect mapping for JDBC type: " + typecode);
+ }
+ return result;
+ }
+
+ /**
+ * get type name for specified type and size
+ * @param typecode the type key
+ * @param size the SQL length
+ * @param scale the SQL scale
+ * @param precision the SQL precision
+ * @return the associated name with smallest capacity >= size,
+ * if available and the default type name otherwise
+ */
+ public String get(int typecode, int size, int precision, int scale) throws IllegalArgumentException
+ {
+ Map map = (Map) weighted.get( new Integer(typecode) );
+ if ( map!=null && map.size()>0 )
+ {
+ // iterate entries ordered by capacity to find first fit
+ Iterator entries = map.entrySet().iterator();
+ while ( entries.hasNext() )
+ {
+ Map.Entry entry = (Map.Entry)entries.next();
+ if ( size <= ( (Integer) entry.getKey() ).intValue() )
+ {
+ return replace( (String) entry.getValue(), size, precision, scale );
+ }
+ }
+ }
+ return replace( get(typecode), size, precision, scale );
+ }
+
+ private static String replace(String type, int size, int precision, int scale)
+ {
+ type = replaceOnce(type, "$s", Integer.toString(scale) );
+ type = replaceOnce(type, "$l", Integer.toString(size) );
+ return replaceOnce(type, "$p", Integer.toString(precision) );
+ }
+
+ /**
+ * set a type name for specified type key and capacity
+ * @param typecode the type key
+ */
+ public void put(int typecode, int capacity, String value)
+ {
+ TreeMap map = (TreeMap)weighted.get( new Integer(typecode) );
+ if (map == null)
+ {// add new ordered map
+ map = new TreeMap();
+ weighted.put( new Integer(typecode), map );
+ }
+ map.put(new Integer(capacity), value);
+ }
+
+ /**
+ * set a default type name for specified type key
+ * @param typecode the type key
+ */
+ public void put(int typecode, String value)
+ {
+ defaults.put( new Integer(typecode), value );
+ }
+
+ private static String replaceOnce(String template, String placeholder, String replacement)
+ {
+ int loc = template == null ? -1 : template.indexOf( placeholder );
+ if ( loc < 0 )
+ {
+ return template;
+ }
+ else
+ {
+ return new StringBuffer( template.substring( 0, loc ) )
+ .append( replacement )
+ .append( template.substring( loc + placeholder.length() ) )
+ .toString();
+ }
+ }
+}
+
+
diff --git a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoOracle9Dialect.java b/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoOracle9Dialect.java
deleted file mode 100644
index d0de3137eb..0000000000
--- a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoOracle9Dialect.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.domain.hibernate.dialect;
-
-import java.sql.Types;
-
-import org.hibernate.dialect.Oracle9Dialect;
-
-/**
- * Does away with the deprecated LONG datatype. This extends the deprecated
- * Oracle9Dialect for good reason: Hibernate ceased supporting
- * right outer join in the Oracle9iDialect.
- *
- * @author Derek Hulley
- * @since 2.2.2
- */
-@SuppressWarnings("deprecation")
-public class AlfrescoOracle9Dialect extends Oracle9Dialect
-{
- public AlfrescoOracle9Dialect()
- {
- super();
- registerColumnType(Types.VARBINARY, "blob");
- registerColumnType(Types.NVARCHAR, 4000, "nvarchar2($l)");
- }
-}
diff --git a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java b/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java
deleted file mode 100644
index ddccbc0f6a..0000000000
--- a/src/main/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.domain.hibernate.dialect;
-
-import java.sql.Types;
-
-import org.hibernate.dialect.SQLServerDialect;
-
-public class AlfrescoSQLServerDialect extends SQLServerDialect
-{
-
- public AlfrescoSQLServerDialect()
- {
- super();
- registerColumnType( Types.VARCHAR, "nvarchar($l)" );
- registerColumnType(Types.CLOB, "nvarchar(max)");
- }
-
-}
diff --git a/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index b38c13916e..3ab570fca0 100644
--- a/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/src/main/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.domain.node.ibatis;
import java.util.ArrayList;
@@ -220,7 +220,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
*/
}
- @SuppressWarnings("unchecked")
@Override
protected ServerEntity selectServer(String ipAddress)
{
@@ -281,7 +280,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.delete(DELETE_TRANSACTION_BY_ID, transaction);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectAllStores()
{
@@ -377,6 +375,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
@Override
+ @SuppressWarnings("rawtypes")
public Pair getNodeIdsIntervalForType(QName type, Long startTxnTime, Long endTxnTime)
{
final Pair intervalPair = new Pair(LONG_ZERO, LONG_ZERO);
@@ -484,7 +483,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectOne(SELECT_NODE_BY_NODEREF, node);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectNodesByUuids(Long storeId, SortedSet uuids)
{
@@ -497,7 +495,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectList(SELECT_NODES_BY_UUIDS, nodeBatchLoadEntity);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectNodesByIds(SortedSet ids)
{
@@ -555,7 +552,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
@Override
- @SuppressWarnings("unchecked")
protected Map> selectNodeProperties(Set nodeIds)
{
if (nodeIds.size() == 0)
@@ -568,13 +564,14 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
List rows = template.selectList(SELECT_NODE_PROPERTIES, prop);
return makePersistentPropertiesMap(rows);
}
+
@Override
protected Map> selectNodeProperties(Long nodeId)
{
return selectNodeProperties(nodeId, Collections.emptySet());
}
+
@Override
- @SuppressWarnings("unchecked")
protected Map> selectNodeProperties(Long nodeId, Set qnameIds)
{
NodePropertyEntity prop = new NodePropertyEntity();
@@ -599,6 +596,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
@Override
+ @SuppressWarnings("rawtypes")
public List selectNodePropertiesByTypes(Set qnames)
{
final List properties = new ArrayList();
@@ -623,6 +621,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return properties;
}
+ @SuppressWarnings("rawtypes")
@Override
public List selectNodePropertiesByDataType(QName dataType, long minNodeId, long maxNodeId)
{
@@ -721,7 +720,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
}
- @SuppressWarnings("unchecked")
@Override
protected Map> selectNodeAspects(Set nodeIds)
{
@@ -778,6 +776,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
Long minNodeId, Long maxNodeId,
final NodeRefQueryCallback resultsCallback)
{
+ @SuppressWarnings("rawtypes")
ResultHandler resultHandler = new ResultHandler()
{
public void handleResult(ResultContext context)
@@ -851,7 +850,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.delete(DELETE_NODE_ASSOCS, param);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectNodeAssocs(Long nodeId)
{
@@ -886,7 +884,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectList(SELECT_NODE_ASSOCS_BY_SOURCE_AND_PROPERTY_VALUE, assoc);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectNodeAssocsByTarget(Long targetNodeId, Long typeQNameId)
{
@@ -989,7 +986,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectOne(SELECT_CHILD_ASSOC_BY_ID, assoc);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectChildNodeIds(
Long nodeId,
@@ -1010,7 +1006,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectList(SELECT_CHILD_NODE_IDS, assoc, rowBounds);
}
- @SuppressWarnings("unchecked")
@Override
public List selectPrimaryChildAcls(Long nodeId)
{
@@ -1025,7 +1020,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectList(SELECT_NODE_PRIMARY_CHILD_ACLS, assoc);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectChildAssoc(
Long parentNodeId,
@@ -1075,6 +1069,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
* @author Derek Hulley
* @since 3.4
*/
+ @SuppressWarnings("rawtypes")
private class ChildAssocResultHandler implements ResultHandler
{
private final ChildAssocResultHandlerFilter filter;
@@ -1178,6 +1173,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
resultsCallback.done();
}
+ @SuppressWarnings("unchecked")
@Override
public void selectChildAssocs(
Long parentNodeId,
@@ -1217,6 +1213,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
RowBounds rowBounds = new RowBounds(0, maxResults);
List entities = template.selectList(SELECT_CHILD_ASSOCS_OF_PARENT_LIMITED, assoc, rowBounds);
+ @SuppressWarnings("rawtypes")
final DefaultResultContext resultContext = new DefaultResultContext();
for (Object entity : entities)
{
@@ -1502,7 +1499,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
resultsCallback.done();
}
- @SuppressWarnings("unchecked")
@Override
protected List selectParentAssocs(Long childNodeId)
{
@@ -1588,7 +1584,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
{
}
- @SuppressWarnings("unchecked")
@Override
protected Transaction selectLastTxnBeforeCommitTime(Long maxCommitTime)
{
@@ -1623,7 +1618,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectOne(SELECT_TXNS, query);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectTxnChanges(Long txnId, Long storeId)
{
@@ -1638,7 +1632,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
return template.selectList(SELECT_TXN_NODES, query);
}
- @SuppressWarnings("unchecked")
@Override
protected List selectTxns(
Long fromTimeInclusive,
@@ -1676,7 +1669,6 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
}
}
- @SuppressWarnings("unchecked")
@Override
protected List selectTxnsUnused(Long minTxnId, Long maxCommitTime, Integer count)
{
@@ -1814,7 +1806,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
/**
* MySQL Cluster NDB specific DAO overrides
*
- * WARNING: Experimental/unsupported - see AlfrescoMySQLClusterNDBDialect !
+ * WARNING: Experimental/unsupported - see MySQLClusterNDBDialect !
*
* @author janv
*/
@@ -1823,38 +1815,38 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
@Override
protected Long newNodeImplInsert(NodeEntity node)
{
- Long id = null;
+ Long id = null;
try
{
- // We need to handle existing deleted nodes.
+ // We need to handle existing deleted nodes.
NodeRef targetNodeRef = node.getNodeRef();
Node dbTargetNode = selectNodeByNodeRef(targetNodeRef);
if (dbTargetNode != null)
{
- if (dbTargetNode.getDeleted(qnameDAO))
- {
- Long dbTargetNodeId = dbTargetNode.getId();
- // This is OK. It happens when we create a node that existed in the past.
- // Remove the row completely
- deleteNodeProperties(dbTargetNodeId, (Set) null);
- deleteNodeById(dbTargetNodeId);
- }
- else
- {
- // A live node exists.
- throw new NodeExistsException(dbTargetNode.getNodePair(), null);
- }
+ if (dbTargetNode.getDeleted(qnameDAO))
+ {
+ Long dbTargetNodeId = dbTargetNode.getId();
+ // This is OK. It happens when we create a node that existed in the past.
+ // Remove the row completely
+ deleteNodeProperties(dbTargetNodeId, (Set) null);
+ deleteNodeById(dbTargetNodeId);
+ }
+ else
+ {
+ // A live node exists.
+ throw new NodeExistsException(dbTargetNode.getNodePair(), null);
+ }
}
id = insertNode(node);
}
catch (Throwable e)
{
- if (e instanceof NodeExistsException)
- {
- throw e;
- }
-
+ if (e instanceof NodeExistsException)
+ {
+ throw e;
+ }
+
// There does not appear to be any row that could prevent an insert
throw new AlfrescoRuntimeException("Failed to insert new node: " + node, e);
}
diff --git a/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java b/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
index 0f19d1dc41..31aff9b9be 100644
--- a/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
+++ b/src/main/java/org/alfresco/repo/domain/schema/DataSourceCheck.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.domain.schema;
import java.sql.Connection;
@@ -31,14 +31,12 @@ import java.sql.DatabaseMetaData;
import javax.sql.DataSource;
import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.hibernate.DialectFactory;
+import org.alfresco.repo.domain.dialect.SQLServerDialect;
+import org.alfresco.repo.domain.dialect.Dialect;
+import org.alfresco.repo.domain.dialect.DialectFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.SQLServerDialect;
import org.springframework.extensions.surf.util.I18NUtil;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
/**
* Bean to log connection details and attempt to ensure that the connection is OK.
@@ -58,17 +56,11 @@ public class DataSourceCheck
/** The required transaction isolation */
private static final int SQL_SERVER_TRANSACTION_ISOLATION = 4096;
- private Configuration cfg;
private String dbUrl;
private String dbUsername;
private int transactionIsolation;
private DataSource dataSource;
- public void setLocalSessionFactory(LocalSessionFactoryBean localSessionFactory)
- {
- this.cfg = localSessionFactory.getConfiguration();
- }
-
public void setDbUrl(String dbUrl)
{
this.dbUrl = dbUrl;
@@ -104,9 +96,9 @@ public class DataSourceCheck
meta.getDatabaseProductName(), meta.getDatabaseProductVersion()));
Dialect dialect = DialectFactory.buildDialect(
- cfg.getProperties(),
meta.getDatabaseProductName(),
- meta.getDatabaseMajorVersion());
+ meta.getDatabaseMajorVersion(),
+ meta.getDriverName());
// Check MS SQL Server specific settings
if (dialect instanceof SQLServerDialect)
diff --git a/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 23866b1c73..ef2238936f 100644
--- a/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/src/main/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -1,51 +1,47 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.domain.schema;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
-import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.DriverManager;
import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -76,10 +72,13 @@ import org.alfresco.repo.admin.patch.AppliedPatch;
import org.alfresco.repo.admin.patch.Patch;
import org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch;
import org.alfresco.repo.content.filestore.FileContentWriter;
-import org.alfresco.repo.domain.hibernate.dialect.AlfrescoMySQLClusterNDBDialect;
-import org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect;
-import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect;
-import org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect;
+import org.alfresco.repo.domain.dialect.MySQLClusterNDBDialect;
+import org.alfresco.repo.domain.dialect.Oracle9Dialect;
+import org.alfresco.repo.domain.dialect.SQLServerDialect;
+import org.alfresco.repo.domain.dialect.DB2Dialect;
+import org.alfresco.repo.domain.dialect.Dialect;
+import org.alfresco.repo.domain.dialect.MySQLInnoDBDialect;
+import org.alfresco.repo.domain.dialect.PostgreSQLDialect;
import org.alfresco.repo.domain.patch.AppliedPatchDAO;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.descriptor.DescriptorService;
@@ -97,26 +96,6 @@ import org.alfresco.util.schemacomp.XMLToSchema;
import org.alfresco.util.schemacomp.model.Schema;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.cfg.Environment;
-import org.hibernate.connection.UserSuppliedConnectionProvider;
-import org.hibernate.dialect.DB2Dialect;
-import org.hibernate.dialect.DerbyDialect;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.HSQLDialect;
-import org.hibernate.dialect.MySQL5Dialect;
-import org.hibernate.dialect.MySQLDialect;
-import org.hibernate.dialect.MySQLInnoDBDialect;
-import org.hibernate.dialect.Oracle10gDialect;
-import org.hibernate.dialect.Oracle9Dialect;
-import org.hibernate.dialect.Oracle9iDialect;
-import org.hibernate.dialect.OracleDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.engine.ActionQueue;
-import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.core.io.Resource;
@@ -124,8 +103,6 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
import org.springframework.extensions.surf.util.I18NUtil;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
-
/**
* Bootstraps the schema and schema update. The schema is considered missing if the applied patch table
@@ -151,11 +128,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
private static final String MSG_EXECUTING_COPIED_SCRIPT = "schema.update.msg.executing_copied_script";
private static final String MSG_EXECUTING_STATEMENT = "schema.update.msg.executing_statement";
private static final String MSG_OPTIONAL_STATEMENT_FAILED = "schema.update.msg.optional_statement_failed";
- private static final String WARN_DIALECT_UNSUPPORTED = "schema.update.warn.dialect_unsupported";
- private static final String WARN_DIALECT_HSQL = "schema.update.warn.dialect_hsql";
- private static final String WARN_DIALECT_DERBY = "schema.update.warn.dialect_derby";
private static final String ERR_FORCED_STOP = "schema.update.err.forced_stop";
- private static final String ERR_DIALECT_SHOULD_USE = "schema.update.err.dialect_should_use";
private static final String ERR_MULTIPLE_SCHEMAS = "schema.update.err.found_multiple";
private static final String ERR_PREVIOUS_FAILED_BOOTSTRAP = "schema.update.err.previous_failed";
private static final String ERR_STATEMENT_FAILED = "schema.update.err.statement_failed";
@@ -191,7 +164,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
*/
public static final void setMaxStringLength(int length, Dialect dialect)
{
- int max = (dialect instanceof AlfrescoMySQLClusterNDBDialect ? DEFAULT_MAX_STRING_LENGTH_NDB : DEFAULT_MAX_STRING_LENGTH);
+ int max = (dialect instanceof MySQLClusterNDBDialect ? DEFAULT_MAX_STRING_LENGTH_NDB : DEFAULT_MAX_STRING_LENGTH);
if (length < max)
{
@@ -268,7 +241,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
private DescriptorService descriptorService;
private DataSource dataSource;
private AppliedPatchDAO appliedPatchDAO;
- private LocalSessionFactoryBean localSessionFactory;
private String schemaOuputFilename;
private boolean updateSchema;
private boolean stopAfterSchemaBootstrap;
@@ -308,16 +280,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
this.appliedPatchDAO = appliedPatchDAO;
}
- public void setLocalSessionFactory(LocalSessionFactoryBean localSessionFactory)
- {
- this.localSessionFactory = localSessionFactory;
- }
-
- public LocalSessionFactoryBean getLocalSessionFactory()
- {
- return localSessionFactory;
- }
-
/**
* Set this to output the full database creation script
*
@@ -415,23 +377,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
}
- /**
- * Get the limit for the hibernate executions queue
- */
- public int getHibernateMaxExecutions()
- {
- return ActionQueue.getMAX_EXECUTIONS_SIZE();
- }
-
- /**
- * Set the limit for the hibernate executions queue
- * Less than zero always uses event amalgamation
- */
- public void setHibernateMaxExecutions(int hibernateMaxExecutions)
- {
- ActionQueue.setMAX_EXECUTIONS_SIZE(hibernateMaxExecutions);
- }
-
/**
* Set db.schema.name to be used
*/
@@ -453,11 +398,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
this.globalProperties = globalProperties;
}
-
- private SessionFactory getSessionFactory()
- {
- return (SessionFactory) localSessionFactory.getObject();
- }
/**
* Register a new script for execution when creating a clean schema. The order of registration
@@ -580,12 +520,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean
* Count applied patches. This fails if multiple applied patch tables are found,
* which normally indicates that the schema view needs to be limited.
*
- * @param cfg The Hibernate config
* @param connection a valid database connection
* @return Returns the number of applied patches
* @throws NoSchemaException if the table of applied patches can't be found
*/
- private int countAppliedPatches(Configuration cfg, Connection connection) throws Exception
+ private int countAppliedPatches(Connection connection) throws Exception
{
String defaultSchema = dbSchemaName != null ? dbSchemaName : databaseMetaDataHelper.getSchema(connection);
@@ -593,7 +532,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
defaultSchema = null;
}
- String defaultCatalog = cfg.getProperty("hibernate.default_catalog");
+ String defaultCatalog = connection.getCatalog();
if (defaultCatalog != null && defaultCatalog.length() == 0)
{
defaultCatalog = null;
@@ -882,19 +821,19 @@ public class SchemaBootstrap extends AbstractLifecycleBean
/**
* Builds the schema from scratch or applies the necessary patches to the schema.
*/
- private boolean updateSchema(Configuration cfg, Session session, Connection connection) throws Exception
+ private boolean updateSchema(Connection connection) throws Exception
{
boolean create = false;
try
{
- countAppliedPatches(cfg, connection);
+ countAppliedPatches(connection);
}
catch (NoSchemaException e)
{
create = true;
}
// Get the dialect
- final Dialect dialect = Dialect.getDialect(cfg.getProperties());
+ final Dialect dialect = this.dialect;
String dialectStr = dialect.getClass().getSimpleName();
if (create)
@@ -904,39 +843,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// execute pre-create scripts (not patches)
for (String scriptUrl : this.preCreateScriptUrls)
{
- executeScriptUrl(cfg, connection, scriptUrl);
- }
- // Build and execute changes generated by Hibernate
- File tempFile = null;
- Writer writer = null;
- try
- {
- DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect);
- String[] sqls = cfg.generateSchemaUpdateScript(dialect, metadata);
- if (sqls.length > 0)
- {
- tempFile = TempFileProvider.createTempFile("AlfrescoSchema-" + dialectStr + "-Update-", ".sql");
- writer = new BufferedWriter(new FileWriter(tempFile));
- for (String sql : sqls)
- {
- writer.append(sql);
- writer.append(";\n");
- }
- try {writer.close();} catch (Throwable e) {}
- executeScriptFile(cfg, connection, tempFile, null);
- }
- }
- finally
- {
- if (writer != null)
- {
- try {writer.close();} catch (Throwable e) {}
- }
+ executeScriptUrl(connection, scriptUrl);
}
// execute post-create scripts (not patches)
for (String scriptUrl : this.postCreateScriptUrls)
{
- executeScriptUrl(cfg, connection, scriptUrl);
+ executeScriptUrl(connection, scriptUrl);
}
if (logger.isInfoEnabled())
@@ -947,41 +859,10 @@ public class SchemaBootstrap extends AbstractLifecycleBean
else
{
// Execute any pre-auto-update scripts
- checkSchemaPatchScripts(cfg, connection, preUpdateScriptPatches, true);
-
- // Build and execute changes generated by Hibernate
- File tempFile = null;
- Writer writer = null;
- try
- {
- DatabaseMetadata metadata = new DatabaseMetadata(connection, dialect);
- String[] sqls = cfg.generateSchemaUpdateScript(dialect, metadata);
- if (sqls.length > 0)
- {
- tempFile = TempFileProvider.createTempFile("AlfrescoSchema-" + dialectStr + "-Update-", ".sql");
- writer = new BufferedWriter(new FileWriter(tempFile));
- for (String sql : sqls)
- {
- writer.append(sql);
- writer.append(";\n");
- }
- }
- }
- finally
- {
- if (writer != null)
- {
- try {writer.close();} catch (Throwable e) {}
- }
- }
- // execute if there were changes raised by Hibernate
- if (tempFile != null)
- {
- executeScriptFile(cfg, connection, tempFile, null);
- }
+ checkSchemaPatchScripts(connection, preUpdateScriptPatches, true);
// Execute any post-auto-update scripts
- checkSchemaPatchScripts(cfg, connection, postUpdateScriptPatches, true);
+ checkSchemaPatchScripts(connection, postUpdateScriptPatches, true);
}
// Initialise Activiti DB, using an unclosable connection
@@ -1016,10 +897,10 @@ public class SchemaBootstrap extends AbstractLifecycleBean
else
{
// Execute any auto-update scripts for Activiti tables
- checkSchemaPatchScripts(cfg, connection, updateActivitiScriptPatches, true);
+ checkSchemaPatchScripts(connection, updateActivitiScriptPatches, true);
// verify that all Activiti patches have been applied correctly
- checkSchemaPatchScripts(cfg, connection, updateActivitiScriptPatches, false);
+ checkSchemaPatchScripts(connection, updateActivitiScriptPatches, false);
}
return create;
@@ -1063,13 +944,12 @@ public class SchemaBootstrap extends AbstractLifecycleBean
* Check that the necessary scripts have been executed against the database
*/
private void checkSchemaPatchScripts(
- Configuration cfg,
Connection connection,
List scriptPatches,
boolean apply) throws Exception
{
// first check if there have been any applied patches
- int appliedPatchCount = countAppliedPatches(cfg, connection);
+ int appliedPatchCount = countAppliedPatches(connection);
if (appliedPatchCount == 0)
{
// This is a new schema, so upgrade scripts are irrelevant
@@ -1116,13 +996,13 @@ public class SchemaBootstrap extends AbstractLifecycleBean
throw AlfrescoRuntimeException.create(ERR_SCRIPT_NOT_RUN, scriptUrl);
}
// it wasn't run and it can be run now
- executeScriptUrl(cfg, connection, scriptUrl);
+ executeScriptUrl(connection, scriptUrl);
}
}
- private void executeScriptUrl(Configuration cfg, Connection connection, String scriptUrl) throws Exception
+ private void executeScriptUrl(Connection connection, String scriptUrl) throws Exception
{
- Dialect dialect = Dialect.getDialect(cfg.getProperties());
+ Dialect dialect = this.dialect;
String dialectStr = dialect.getClass().getSimpleName();
InputStream scriptInputStream = getScriptInputStream(dialect.getClass(), scriptUrl);
// check that it exists
@@ -1145,7 +1025,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// now execute it
String dialectScriptUrl = scriptUrl.replaceAll(PLACEHOLDER_DIALECT, dialect.getClass().getName());
// Replace the script placeholders
- executeScriptFile(cfg, connection, tempFile, dialectScriptUrl);
+ executeScriptFile(connection, tempFile, dialectScriptUrl);
}
/**
@@ -1219,19 +1099,17 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
/**
- * @param cfg the Hibernate configuration
* @param connection the DB connection to use
* @param scriptFile the file containing the statements
* @param scriptUrl the URL of the script to report. If this is null, the script
* is assumed to have been auto-generated.
*/
private void executeScriptFile(
- Configuration cfg,
Connection connection,
File scriptFile,
String scriptUrl) throws Exception
{
- final Dialect dialect = Dialect.getDialect(cfg.getProperties());
+ final Dialect dialect = this.dialect;
StringBuilder executedStatements = executedStatementsThreadLocal.get();
if (executedStatements == null)
@@ -1315,7 +1193,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
String includedScriptUrl = sql.substring(10, sql.length());
// Execute the script in line
- executeScriptUrl(cfg, connection, includedScriptUrl);
+ executeScriptUrl(connection, includedScriptUrl);
}
// Check for variable assignment
else if (sql.startsWith("--ASSIGN:"))
@@ -1488,11 +1366,11 @@ public class SchemaBootstrap extends AbstractLifecycleBean
sql = sql.replaceAll("(?i)TYPE=InnoDB", "ENGINE=InnoDB");
}
- if (this.dialect != null && this.dialect instanceof AlfrescoMySQLClusterNDBDialect)
+ if (this.dialect != null && this.dialect instanceof MySQLClusterNDBDialect)
{
// note: enable bootstrap on MySQL Cluster NDB
/*
- * WARNING: Experimental/unsupported - see AlfrescoMySQLClusterNDBDialect !
+ * WARNING: Experimental/unsupported - see MySQLClusterNDBDialect !
*/
sql = sql.replaceAll("(?i)TYPE=InnoDB", "ENGINE=NDB"); // belts-and-braces
sql = sql.replaceAll("(?i)ENGINE=InnoDB", "ENGINE=NDB");
@@ -1604,45 +1482,39 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
Class dialectClazz = dialect.getClass();
LogUtil.info(logger, MSG_DIALECT_USED, dialectClazz.getName());
- if (dialectClazz.equals(MySQLDialect.class) || dialectClazz.equals(MySQL5Dialect.class))
- {
- LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), MySQLInnoDBDialect.class.getName());
- throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
- }
- else if (dialectClazz.equals(HSQLDialect.class))
- {
- LogUtil.info(logger, WARN_DIALECT_HSQL);
- }
- else if (dialectClazz.equals(DerbyDialect.class))
- {
- LogUtil.info(logger, WARN_DIALECT_DERBY);
- }
- else if (dialectClazz.equals(Oracle9iDialect.class) || dialectClazz.equals(Oracle10gDialect.class))
- {
- LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), AlfrescoOracle9Dialect.class.getName());
- throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
- }
- else if (dialectClazz.equals(OracleDialect.class) || dialectClazz.equals(Oracle9Dialect.class))
- {
- LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), AlfrescoOracle9Dialect.class.getName());
- throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
- }
+// if (dialectClazz.equals(MySQLDialect.class) || dialectClazz.equals(MySQL5Dialect.class))
+// {
+// LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), MySQLInnoDBDialect.class.getName());
+// throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
+// }
+// else if (dialectClazz.equals(HSQLDialect.class))
+// {
+// LogUtil.info(logger, WARN_DIALECT_HSQL);
+// }
+// else if (dialectClazz.equals(DerbyDialect.class))
+// {
+// LogUtil.info(logger, WARN_DIALECT_DERBY);
+// }
+// else if (dialectClazz.equals(Oracle9iDialect.class) || dialectClazz.equals(Oracle10gDialect.class))
+// {
+// LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), Oracle9Dialect.class.getName());
+// throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
+// }
+// else if (dialectClazz.equals(OracleDialect.class) || dialectClazz.equals(Oracle9Dialect.class))
+// {
+// LogUtil.error(logger, ERR_DIALECT_SHOULD_USE, dialectClazz.getName(), Oracle9Dialect.class.getName());
+// throw AlfrescoRuntimeException.create(WARN_DIALECT_UNSUPPORTED, dialectClazz.getName());
+// }
int maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
int serializableType = SerializableTypeHandler.getSerializableType();
// Adjust the maximum allowable String length according to the dialect
- if (dialect instanceof AlfrescoSQLServerDialect)
+ if (dialect instanceof SQLServerDialect)
{
// string_value nvarchar(1024) null,
// serializable_value image null,
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
}
- else if (dialect instanceof AlfrescoSybaseAnywhereDialect)
- {
- // string_value text null,
- // serializable_value varbinary(8192) null,
- maxStringLength = Integer.MAX_VALUE;
- }
else if (dialect instanceof DB2Dialect)
{
// string_value varchar(1024),
@@ -1650,13 +1522,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
serializableType = Types.BLOB;
}
- else if (dialect instanceof HSQLDialect)
- {
- // string_value varchar(1024),
- // serializable_value varbinary(8192),
- maxStringLength = SchemaBootstrap.DEFAULT_MAX_STRING_LENGTH;
- }
- else if (dialect instanceof AlfrescoMySQLClusterNDBDialect)
+ else if (dialect instanceof MySQLClusterNDBDialect)
{
// string_value varchar(400),
// serializable_value blob,
@@ -1668,7 +1534,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
// serializable_value blob,
maxStringLength = Integer.MAX_VALUE;
}
- else if (dialect instanceof AlfrescoOracle9Dialect)
+ else if (dialect instanceof Oracle9Dialect)
{
// string_value varchar2(1024 char),
// serializable_value blob,
@@ -1701,7 +1567,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
}
// do everything in a transaction
- Session session = getSessionFactory().openSession();
Connection connection = null;
try
{
@@ -1709,17 +1574,10 @@ public class SchemaBootstrap extends AbstractLifecycleBean
connection = dataSource.getConnection();
connection.setAutoCommit(true);
LogUtil.info(logger, MSG_DATABASE_USED, connection);
-
- Configuration cfg = localSessionFactory.getConfiguration();
-
+
// Check and dump the dialect being used
checkDialect(this.dialect);
- // Ensure that our static connection provider is used
- String defaultConnectionProviderFactoryClass = cfg.getProperty(Environment.CONNECTION_PROVIDER);
- cfg.setProperty(Environment.CONNECTION_PROVIDER, SchemaBootstrapConnectionProvider.class.getName());
- SchemaBootstrapConnectionProvider.setBootstrapConnection(connection);
-
// Update the schema, if required.
if (updateSchema)
{
@@ -1734,7 +1592,7 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
try
{
- createdSchema = updateSchema(cfg, session, connection);
+ createdSchema = updateSchema(connection);
updatedSchema = true;
break;
}
@@ -1780,8 +1638,8 @@ public class SchemaBootstrap extends AbstractLifecycleBean
if (! createdSchema)
{
// verify that all patches have been applied correctly
- checkSchemaPatchScripts(cfg, connection, preUpdateScriptPatches, false); // check scripts
- checkSchemaPatchScripts(cfg, connection, postUpdateScriptPatches, false); // check scripts
+ checkSchemaPatchScripts(connection, preUpdateScriptPatches, false); // check scripts
+ checkSchemaPatchScripts(connection, postUpdateScriptPatches, false); // check scripts
}
if (executedStatements != null)
@@ -1814,9 +1672,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
throw new BootstrapStopException();
}
- // Reset the configuration
- cfg.setProperty(Environment.CONNECTION_PROVIDER, defaultConnectionProviderFactoryClass);
-
if (event != null)
{
// all done successfully
@@ -1853,20 +1708,6 @@ public class SchemaBootstrap extends AbstractLifecycleBean
{
logger.warn("Error closing DB connection: " + e.getMessage());
}
- try
- {
- if (session != null)
- {
- session.close();
- }
- }
- catch (Throwable e)
- {
- logger.warn("Error closing Hibernate session: " + e.getMessage());
- }
- // Remove the connection reference from the threadlocal boostrap
- SchemaBootstrapConnectionProvider.setBootstrapConnection(null);
-
}
}
@@ -2159,91 +2000,10 @@ public class SchemaBootstrap extends AbstractLifecycleBean
return files;
}
-
+
@Override
protected void onShutdown(ApplicationEvent event)
{
- // Shut down DB, if required
- Class dialectClazz = this.dialect.getClass();
- if (dialectClazz.equals(DerbyDialect.class))
- {
- try
- {
- DriverManager.getConnection("jdbc:derby:;shutdown=true");
- }
- // Derby shutdown always triggers an exception, even when clean
- catch (Throwable e)
- {
- }
- }
- }
-
- /**
- * This is a workaround for the odd Spring-Hibernate interaction during configuration.
- * The Hibernate code assumes that schema scripts will be generated during context
- * initialization. We want to do it afterwards and have a little more control. Hence this class.
- *
- * The connection that is used will not be closed or manipulated in any way. This class
- * merely serves to give the connection to Hibernate.
- *
- * @author Derek Hulley
- */
- public static class SchemaBootstrapConnectionProvider extends UserSuppliedConnectionProvider
- {
- private static ThreadLocal threadLocalConnection = new ThreadLocal();
-
- public SchemaBootstrapConnectionProvider()
- {
- }
-
- /**
- * Set the connection for Hibernate to use for schema generation.
- */
- public static void setBootstrapConnection(Connection connection)
- {
- threadLocalConnection.set(connection);
- }
-
- /**
- * Unsets the connection.
- */
- @Override
- public void close()
- {
- // Leave the connection well alone, just remove it
- threadLocalConnection.set(null);
- }
-
- /**
- * Does nothing. The connection was given by a 3rd party and they can close it.
- */
- @Override
- public void closeConnection(Connection conn)
- {
- }
-
- /**
- * Does nothing.
- */
- @Override
- public void configure(Properties props) throws HibernateException
- {
- }
-
- /**
- * @see #setBootstrapConnection(Connection)
- */
- @Override
- public Connection getConnection()
- {
- return threadLocalConnection.get();
- }
-
- @Override
- public boolean supportsAggressiveRelease()
- {
- return false;
- }
}
/**
diff --git a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java b/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
index cd2b5cf4c7..3c9af0f0da 100644
--- a/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
+++ b/src/main/java/org/alfresco/repo/domain/schema/script/ScriptExecutorImpl.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.domain.schema.script;
import java.io.BufferedReader;
@@ -42,20 +42,18 @@ import javax.sql.DataSource;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.content.filestore.FileContentWriter;
-import org.alfresco.repo.domain.hibernate.dialect.AlfrescoMySQLClusterNDBDialect;
+import org.alfresco.repo.domain.dialect.MySQLClusterNDBDialect;
+import org.alfresco.repo.domain.dialect.Dialect;
+import org.alfresco.repo.domain.dialect.MySQLInnoDBDialect;
+import org.alfresco.repo.domain.dialect.PostgreSQLDialect;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.util.LogUtil;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.MySQLInnoDBDialect;
-import org.hibernate.dialect.PostgreSQLDialect;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
public class ScriptExecutorImpl implements ScriptExecutor
@@ -83,7 +81,6 @@ public class ScriptExecutorImpl implements ScriptExecutor
private Dialect dialect;
private ResourcePatternResolver rpr = new PathMatchingResourcePatternResolver(this.getClass().getClassLoader());
private static Log logger = LogFactory.getLog(ScriptExecutorImpl.class);
- private LocalSessionFactoryBean localSessionFactory;
private Properties globalProperties;
private ThreadLocal executedStatementsThreadLocal = new ThreadLocal();
private DataSource dataSource;
@@ -133,17 +130,6 @@ public class ScriptExecutorImpl implements ScriptExecutor
{
globalProperties = new Properties();
}
-
-
- public void setLocalSessionFactory(LocalSessionFactoryBean localSessionFactory)
- {
- this.localSessionFactory = localSessionFactory;
- }
-
- public LocalSessionFactoryBean getLocalSessionFactory()
- {
- return localSessionFactory;
- }
public void setDataSource(DataSource dataSource)
{
@@ -165,12 +151,11 @@ public class ScriptExecutorImpl implements ScriptExecutor
@Override
public void executeScriptUrl(String scriptUrl) throws Exception
{
- Configuration cfg = localSessionFactory.getConfiguration();
Connection connection = dataSource.getConnection();
connection.setAutoCommit(true);
try
{
- executeScriptUrl(cfg, connection, scriptUrl);
+ executeScriptUrl(connection, scriptUrl);
}
finally
{
@@ -178,9 +163,9 @@ public class ScriptExecutorImpl implements ScriptExecutor
}
}
- private void executeScriptUrl(Configuration cfg, Connection connection, String scriptUrl) throws Exception
+ private void executeScriptUrl(Connection connection, String scriptUrl) throws Exception
{
- Dialect dialect = Dialect.getDialect(cfg.getProperties());
+ Dialect dialect = this.dialect;
String dialectStr = dialect.getClass().getSimpleName();
InputStream scriptInputStream = getScriptInputStream(dialect.getClass(), scriptUrl);
// check that it exists
@@ -203,7 +188,7 @@ public class ScriptExecutorImpl implements ScriptExecutor
// now execute it
String dialectScriptUrl = scriptUrl.replaceAll(PLACEHOLDER_DIALECT, dialect.getClass().getName());
// Replace the script placeholders
- executeScriptFile(cfg, connection, tempFile, dialectScriptUrl);
+ executeScriptFile(connection, tempFile, dialectScriptUrl);
}
/**
@@ -281,19 +266,17 @@ public class ScriptExecutorImpl implements ScriptExecutor
}
/**
- * @param cfg the Hibernate configuration
* @param connection the DB connection to use
* @param scriptFile the file containing the statements
* @param scriptUrl the URL of the script to report. If this is null, the script
* is assumed to have been auto-generated.
*/
private void executeScriptFile(
- Configuration cfg,
Connection connection,
File scriptFile,
String scriptUrl) throws Exception
{
- final Dialect dialect = Dialect.getDialect(cfg.getProperties());
+ final Dialect dialect = this.dialect;
StringBuilder executedStatements = executedStatementsThreadLocal.get();
if (executedStatements == null)
@@ -371,7 +354,7 @@ public class ScriptExecutorImpl implements ScriptExecutor
}
String includedScriptUrl = sql.substring(10, sql.length());
// Execute the script in line
- executeScriptUrl(cfg, connection, includedScriptUrl);
+ executeScriptUrl(connection, includedScriptUrl);
}
// Check for variable assignment
else if (sql.startsWith("--ASSIGN:"))
@@ -546,11 +529,11 @@ public class ScriptExecutorImpl implements ScriptExecutor
sql = sql.replaceAll("(?i)TYPE=InnoDB", "ENGINE=InnoDB");
}
- if (this.dialect != null && this.dialect instanceof AlfrescoMySQLClusterNDBDialect)
+ if (this.dialect != null && this.dialect instanceof MySQLClusterNDBDialect)
{
// note: enable bootstrap on MySQL Cluster NDB
/*
- * WARNING: Experimental/unsupported - see AlfrescoMySQLClusterNDBDialect !
+ * WARNING: Experimental/unsupported - see MySQLClusterNDBDialect !
*/
sql = sql.replaceAll("(?i)TYPE=InnoDB", "ENGINE=NDB"); // belts-and-braces
sql = sql.replaceAll("(?i)ENGINE=InnoDB", "ENGINE=NDB");
diff --git a/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java b/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
index 8873016bed..bbe2e49cd1 100644
--- a/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
+++ b/src/main/java/org/alfresco/repo/management/DynamicMBeanExporter.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.management;
import javax.management.JMException;
@@ -30,7 +30,7 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.springframework.jmx.export.MBeanExporter;
-import org.springframework.jmx.support.MBeanRegistrationSupport;
+import org.springframework.jmx.support.RegistrationPolicy;
/**
* An {@link MBeanExporter} that allows individual MBeans to be registered and unregistered over time.
@@ -51,9 +51,9 @@ public class DynamicMBeanExporter extends MBeanExporter implements DynamicMBeanE
setServer(server);
}
- // Make replace existing the default registration behavior
- setRegistrationBehavior(MBeanRegistrationSupport.REGISTRATION_REPLACE_EXISTING);
- setAutodetectMode(MBeanExporter.AUTODETECT_NONE);
+ // Make replace existing the default registration behavior
+ setRegistrationPolicy(RegistrationPolicy.IGNORE_EXISTING);
+ setAutodetectMode(MBeanExporter.AUTODETECT_NONE);
}
@Override
diff --git a/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java b/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
index a324392457..baae82464e 100644
--- a/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
+++ b/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.management;
import java.util.Collection;
@@ -49,6 +49,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.event.GenericApplicationListenerAdapter;
import org.springframework.context.event.SmartApplicationListener;
import org.springframework.core.OrderComparator;
+import org.springframework.core.ResolvableType;
/**
* Abstract implementation of the {@link ApplicationEventMulticaster} interface,
@@ -199,6 +200,12 @@ public class SafeApplicationEventMulticaster implements ApplicationEventMulticas
}
}
+ @Override
+ public void multicastEvent(ApplicationEvent event, ResolvableType eventType)
+ {
+ multicastEvent(event);
+ }
+
@SuppressWarnings("unchecked")
protected void multicastEventInternal(final ApplicationEvent event) {
for (final ApplicationListener listener : getApplicationListeners(event)) {
diff --git a/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java b/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
index 88e5b77cb1..95ce12a82e 100644
--- a/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
+++ b/src/main/java/org/alfresco/repo/solr/SOLRAdminClient.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.solr;
import java.net.MalformedURLException;
@@ -33,7 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.httpclient.HttpClientFactory;
import org.alfresco.util.ParameterCheck;
@@ -47,12 +46,15 @@ import org.apache.solr.client.solrj.impl.XMLResponseParser;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
-import org.quartz.CronTrigger;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
+import org.quartz.JobKey;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
@@ -333,19 +335,23 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware, Disposab
// It is not expected that this will occur during production, but it is possible during automated testing
// where application contexts could be rebuilt between test cases, leading to multiple creations of
// equivalent Quartz jobs. Quartz disallows the scheduling of multiple jobs with the same name and group.
- JobDetail existingJob = scheduler.getJobDetail(jobName, jobGroup);
+ JobDetail existingJob = scheduler.getJobDetail(new JobKey(jobName, jobGroup));
if (existingJob != null)
{
- scheduler.deleteJob(jobName, jobGroup);
+ scheduler.deleteJob(existingJob.getKey());
}
-
- JobDetail job = new JobDetail(jobName, jobGroup, SOLRWatcherJob.class);
- JobDataMap jobDataMap = new JobDataMap();
- jobDataMap.put("SOLR_TRACKER", this);
- job.setJobDataMap(jobDataMap);
-
- trigger = new CronTrigger("SolrWatcherTrigger", jobGroup, solrPingCronExpression);
- scheduler.scheduleJob(job, trigger);
+ JobDataMap jobDataMap = new JobDataMap();
+ jobDataMap.put("SOLR_TRACKER", this);
+ final JobDetail jobDetail = JobBuilder.newJob()
+ .withIdentity(jobName, jobGroup)
+ .usingJobData(jobDataMap)
+ .ofType(SOLRWatcherJob.class)
+ .build();
+ trigger = TriggerBuilder.newTrigger()
+ .withIdentity("rmt")
+ .withSchedule(CronScheduleBuilder.cronSchedule(solrPingCronExpression))
+ .build();
+ scheduler.scheduleJob(jobDetail, trigger);
}
catch(Exception e)
{
@@ -355,12 +361,12 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware, Disposab
protected void startTimer() throws SchedulerException
{
- scheduler.resumeTrigger(trigger.getName(), trigger.getGroup());
+ scheduler.resumeTrigger(trigger.getKey());
}
protected void stopTimer() throws SchedulerException
{
- scheduler.pauseTrigger(trigger.getName(), trigger.getGroup());
+ scheduler.pauseTrigger(trigger.getKey());
}
void registerCores(List cores)
diff --git a/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java b/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
index 965c94d10a..3014788151 100644
--- a/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
+++ b/src/main/java/org/alfresco/repo/transaction/AlfrescoTransactionSupport.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.transaction;
import java.util.Set;
@@ -34,7 +34,6 @@ import org.alfresco.util.transaction.TransactionListener;
import org.alfresco.util.transaction.TransactionSupportUtil;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.springframework.orm.hibernate3.SessionFactoryUtils;
import org.springframework.transaction.support.TransactionSynchronizationManager;
/**
@@ -67,10 +66,8 @@ public abstract class AlfrescoTransactionSupport extends TransactionSupportUtil
/**
* The order of synchronization set to be 100 less than the Hibernate synchronization order
*/
- public static final int SESSION_SYNCHRONIZATION_ORDER =
- SessionFactoryUtils.SESSION_SYNCHRONIZATION_ORDER - 100;
+ public static final int SESSION_SYNCHRONIZATION_ORDER = 800;
-
private static Log logger = LogFactory.getLog(AlfrescoTransactionSupport.class);
/**
@@ -101,11 +98,6 @@ public abstract class AlfrescoTransactionSupport extends TransactionSupportUtil
return TxnReadState.TXN_NONE;
}
// Find the read-write state of the txn
- if (getResource(RESOURCE_KEY_TXN_COMPLETING) != null)
- {
- // Transaction is completing. For all intents and purposes, we are not in a transaction.
- return TxnReadState.TXN_NONE;
- }
else if (TransactionSynchronizationManager.isCurrentTransactionReadOnly())
{
return TxnReadState.TXN_READ_ONLY;
@@ -268,13 +260,13 @@ public abstract class AlfrescoTransactionSupport extends TransactionSupportUtil
/**
* Method that registers a Listener against
* the transaction.
- *
will be better for the caller
- * to only bind once per transaction, if possible.
- *
- * @param listener the transaction listener
- * tasks on
- *
- * @since 5.0
+ *
will be better for the caller
+ * to only bind once per transaction, if possible.
+ *
+ * @param listener the transaction listener
+ * tasks on
+ *
+ * @since 5.0
*/
public static void bindListener(TransactionListener listener)
{
diff --git a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java b/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
index 96c59a6020..5e77b943b5 100644
--- a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
+++ b/src/main/java/org/alfresco/repo/transaction/RetryingTransactionHelper.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.transaction;
import java.lang.reflect.Method;
@@ -52,13 +52,6 @@ import org.alfresco.util.LockHelper.LockTryException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ibatis.exceptions.TooManyResultsException;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.StaleObjectStateException;
-import org.hibernate.StaleStateException;
-import org.hibernate.cache.CacheException;
-import org.hibernate.exception.ConstraintViolationException;
-import org.hibernate.exception.LockAcquisitionException;
-import org.hibernate.exception.SQLGrammarException;
import org.springframework.aop.MethodBeforeAdvice;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.dao.ConcurrencyFailureException;
@@ -105,20 +98,13 @@ public class RetryingTransactionHelper
Class[] coreClasses = new Class[] {
ConcurrencyFailureException.class,
DeadlockLoserDataAccessException.class,
- StaleObjectStateException.class,
JdbcUpdateAffectedIncorrectNumberOfRowsException.class, // Similar to StaleObjectState
- LockAcquisitionException.class,
- ConstraintViolationException.class,
UncategorizedSQLException.class,
SQLException.class,
BatchUpdateException.class,
DataIntegrityViolationException.class,
LicenseIntegrityException.class,
- StaleStateException.class,
TooManyResultsException.class, // Expected one result but found multiple (bad key alert)
- ObjectNotFoundException.class,
- CacheException.class, // Usually a cache replication issue
- SQLGrammarException.class, // Actually specific to MS SQL Server 2005 - we check for this
LockTryException.class
};
@@ -642,11 +628,6 @@ public class RetryingTransactionHelper
// Someone decided that the txn should NOT retry
return null;
}
- else if (retryCause instanceof SQLGrammarException
- && ((SQLGrammarException) retryCause).getErrorCode() != 3960)
- {
- return null;
- }
else if (retryCause instanceof UncategorizedSQLException)
{
// The exception will have been caused by something else, so check that instead
diff --git a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java b/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
index 08663a5160..fafda6fabc 100755
--- a/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
+++ b/src/main/java/org/alfresco/repo/transaction/RetryingTransactionInterceptor.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.transaction;
import java.lang.reflect.Method;
@@ -64,7 +64,7 @@ public class RetryingTransactionInterceptor extends TransactionAspectSupport imp
method, invocation.getThis().getClass());
final PlatformTransactionManager tm = determineTransactionManager(txnAttr);
@SuppressWarnings("deprecation")
- final String joinpointIdentification = methodIdentification(invocation.getMethod());
+ final String joinpointIdentification = methodIdentification(invocation.getMethod(), invocation.getThis().getClass());
final int propagationBehaviour = txnAttr.getPropagationBehavior();
try
{
diff --git a/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java b/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
index 6f9531db00..44380364ae 100644
--- a/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
+++ b/src/main/java/org/alfresco/repo/usage/RepoUsageMonitor.java
@@ -45,14 +45,16 @@ import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.quartz.Job;
+import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
+import org.quartz.SimpleScheduleBuilder;
import org.quartz.Trigger;
-import org.quartz.TriggerUtils;
+import org.quartz.TriggerBuilder;
/**
* This component monitors the repository usages, issuing warnings and errors
@@ -124,17 +126,24 @@ public class RepoUsageMonitor implements RepoUsageComponent.RestrictionObserver
PropertyCheck.mandatory(this, "jobLockService", jobLockService);
// Trigger the scheduled updates
- final JobDetail jobDetail = new JobDetail("rmj", Scheduler.DEFAULT_GROUP, RepoUsageMonitorJob.class);
- jobDetail.getJobDataMap().put("RepoUsageMonitor", this);
- final Trigger trigger = TriggerUtils.makeHourlyTrigger(12); // every 12 hours
- trigger.setStartTime(new Date(System.currentTimeMillis() + 60L * 60L * 1000L)); // one hour from now
- trigger.setName("rmt");
- trigger.setGroup(Scheduler.DEFAULT_GROUP);
-
+ JobDataMap jobDataMap = new JobDataMap();
+ jobDataMap.put("RepoUsageMonitor", this);
+ final JobDetail jobDetail = JobBuilder.newJob()
+ .withIdentity("rmj")
+ .usingJobData(jobDataMap)
+ .ofType(RepoUsageMonitorJob.class)
+ .build();
+
+ final Trigger trigger = TriggerBuilder.newTrigger()
+ .withIdentity("rmt")
+ .withSchedule(SimpleScheduleBuilder.repeatHourlyForever().withIntervalInHours(12))
+ .startAt(new Date(System.currentTimeMillis() + 60L * 60L * 1000L))
+ .build();
+
repoUsageComponent.observeRestrictions(this);
// Unschedule in case it was scheduled in an earlier retry of the transaction
- scheduler.unscheduleJob("rmt", Scheduler.DEFAULT_GROUP);
+ scheduler.unscheduleJob(trigger.getKey());
scheduler.scheduleJob(jobDetail, trigger);
}
diff --git a/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java b/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java
new file mode 100644
index 0000000000..77a0afb2f9
--- /dev/null
+++ b/src/main/java/org/alfresco/schedule/AlfrescoSchedulerAccessorBean.java
@@ -0,0 +1,83 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2018 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.schedule;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.TriggerKey;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.lang.Nullable;
+import org.springframework.scheduling.quartz.SchedulerAccessorBean;
+
+/**
+ * The class is designed to add enabled check to switch on/off the triggers scheduling.
+ * The default is true.
+ *
+ * @since 6.0
+ *
+ * @author amukha
+ */
+public class AlfrescoSchedulerAccessorBean extends SchedulerAccessorBean implements DisposableBean
+{
+ @Nullable
+ private List triggerKeys;
+ private boolean enabled = true;
+
+ public boolean isEnabled()
+ {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled)
+ {
+ this.enabled = enabled;
+ }
+
+ @Override
+ public void setTriggers(Trigger... triggers)
+ {
+ super.setTriggers(triggers);
+ this.triggerKeys = Arrays.stream(triggers).map(Trigger::getKey).collect(Collectors.toList());
+ }
+
+ @Override
+ public void afterPropertiesSet() throws SchedulerException
+ {
+ if (isEnabled())
+ {
+ super.afterPropertiesSet();
+ }
+ }
+
+ @Override
+ public void destroy() throws Exception
+ {
+ getScheduler().unscheduleJobs(triggerKeys);
+ }
+}
diff --git a/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java b/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
index e079008398..f4629046f3 100644
--- a/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
+++ b/src/main/java/org/alfresco/util/DatabaseMetaDataHelper.java
@@ -28,11 +28,8 @@ package org.alfresco.util;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.cfg.Configuration;
-import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
/**
* Helper class to collect all of our DatabaseMetaData interpretations in one place.
@@ -40,98 +37,63 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
* @author sfrensley
*
*/
-public class DatabaseMetaDataHelper {
+public class DatabaseMetaDataHelper
+{
private static Log logger = LogFactory.getLog(DatabaseMetaDataHelper.class);
- private Configuration cfg;
-
- public void setLocalSessionFactory(LocalSessionFactoryBean localSessionFactory)
- {
- this.cfg = localSessionFactory.getConfiguration();
- }
-
/**
- * Trys to determine the schema name from the DatabaseMetaData obtained from the Connection.
+ * Tries to determine the schema name from the DatabaseMetaData obtained from the Connection.
* @param connection A database connection
* @return String
*/
- private String getSchemaFromConnection(Connection connection)
- {
-
- if (connection == null) {
- logger.error("Unable to determine schema due to null connection.");
- return null;
- }
-
- ResultSet schemas = null;
-
- try
- {
- final DatabaseMetaData dbmd = connection.getMetaData();
-
- // Assume that if there are schemas, we want the one named after the connection user or the one called "dbo" (MS
- // SQL hack)
- String schema = null;
- schemas = dbmd.getSchemas();
- while (schemas.next())
- {
- final String thisSchema = schemas.getString("TABLE_SCHEM");
- if (thisSchema.equals(dbmd.getUserName()) || thisSchema.equalsIgnoreCase("dbo"))
- {
- schema = thisSchema;
- break;
- }
- }
- return schema;
- }
- catch (Exception e)
- {
- logger.error("Unable to determine current schema.",e);
- }
- finally
- {
- if (schemas != null)
- {
- try
- {
- schemas.close();
- }
- catch (Exception e)
- {
- //noop
- }
- }
- }
- return null;
- }
-
public String getSchema(Connection connection)
{
- String schema = null;
-
- if (this.cfg != null)
+ if (connection == null)
{
- String tmpSchema = this.cfg.getProperty("hibernate.default_schema");
- if (tmpSchema != null && tmpSchema.trim().length() > 0)
+ logger.error("Unable to determine schema due to null connection.");
+ return null;
+ }
+
+ ResultSet schemas = null;
+
+ try
+ {
+ final DatabaseMetaData dbmd = connection.getMetaData();
+
+ // Assume that if there are schemas, we want the one named after the connection user or the one called "dbo" (MS
+ // SQL hack)
+ String schema = null;
+ schemas = dbmd.getSchemas();
+ while (schemas.next())
{
- schema = tmpSchema;
+ final String thisSchema = schemas.getString("TABLE_SCHEM");
+ if (thisSchema.equals(dbmd.getUserName()) || thisSchema.equalsIgnoreCase("dbo"))
+ {
+ schema = thisSchema;
+ break;
+ }
+ }
+ return schema;
+ }
+ catch (Exception e)
+ {
+ logger.error("Unable to determine current schema.",e);
+ }
+ finally
+ {
+ if (schemas != null)
+ {
+ try
+ {
+ schemas.close();
+ }
+ catch (Exception e)
+ {
+ //noop
+ }
}
}
-
- // if hibernate.default_schema was specified as a system property, then override previous value
- String tmpSchema = System.getProperty("hibernate.default_schema");
- if (tmpSchema != null && tmpSchema.length() > 0)
- {
- schema = tmpSchema;
- }
-
- if (schema == null)
- {
- schema = getSchemaFromConnection(connection);
- }
-
- return schema;
+ return null;
}
-
}
diff --git a/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java b/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java
new file mode 100644
index 0000000000..27d3b5d5da
--- /dev/null
+++ b/src/main/java/org/alfresco/util/resource/HierarchicalResourceLoader.java
@@ -0,0 +1,210 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.util.resource;
+
+import org.alfresco.util.PropertyCheck;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+
+/**
+ * Locate resources by using a class hierarchy to drive the search. The well-known
+ * placeholder {@link #DEFAULT_DIALECT_PLACEHOLDER} is replaced with successive class
+ * names starting from the {@link #setDialectClass(String) dialect class} and
+ * progressing up the hierarchy until the {@link #setDialectBaseClass(String) base class}
+ * is reached. A full resource search using Spring's {@link DefaultResourceLoader} is
+ * done at each point until the resource is found or the base of the class hierarchy is
+ * reached.
+ *
+ * For example assume classpath resources:
+ *
+ *
+ * @author Derek Hulley
+ * @since 3.2 (Mobile)
+ */
+public class HierarchicalResourceLoader extends DefaultResourceLoader implements InitializingBean
+{
+ public static final String DEFAULT_DIALECT_PLACEHOLDER = "#resource.dialect#";
+ public static final String DEFAULT_DIALECT_REGEX = "\\#resource\\.dialect\\#";
+
+ private String dialectBaseClass;
+ private String dialectClass;
+
+ /**
+ * Create a new HierarchicalResourceLoader.
+ */
+ public HierarchicalResourceLoader()
+ {
+ super();
+ }
+
+ /**
+ * Set the class to be used during hierarchical dialect replacement. Searches for the
+ * configuration location will not go further up the hierarchy than this class.
+ *
+ * @param className the name of the class or interface
+ */
+ public void setDialectBaseClass(String className)
+ {
+ this.dialectBaseClass = className;
+ }
+
+ public void setDialectClass(String className)
+ {
+ this.dialectClass = className;
+ }
+
+ public void afterPropertiesSet() throws Exception
+ {
+ PropertyCheck.mandatory(this, "dialectBaseClass", dialectBaseClass);
+ PropertyCheck.mandatory(this, "dialectClass", dialectClass);
+ }
+
+ /**
+ * Get a resource using the defined class hierarchy as a search path.
+ *
+ * @param location the location including a {@link #DEFAULT_DIALECT_PLACEHOLDER placeholder}
+ * @return a resource found by successive searches using class name replacement, or
+ * null if not found.
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public Resource getResource(String location)
+ {
+ if (dialectClass == null || dialectBaseClass == null)
+ {
+ return super.getResource(location);
+ }
+
+ // If a property value has not been substituted, extract the property name and load from system
+ String dialectBaseClassStr = dialectBaseClass;
+ if (!PropertyCheck.isValidPropertyString(dialectBaseClass))
+ {
+ String prop = PropertyCheck.getPropertyName(dialectBaseClass);
+ dialectBaseClassStr = System.getProperty(prop, dialectBaseClass);
+ }
+ String dialectClassStr = dialectClass;
+ if (!PropertyCheck.isValidPropertyString(dialectClass))
+ {
+ String prop = PropertyCheck.getPropertyName(dialectClass);
+ dialectClassStr = System.getProperty(prop, dialectClass);
+ }
+
+ Class dialectBaseClazz;
+ try
+ {
+ dialectBaseClazz = Class.forName(dialectBaseClassStr);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("Dialect base class not found: " + dialectBaseClassStr);
+ }
+ Class dialectClazz;
+ try
+ {
+ dialectClazz = Class.forName(dialectClassStr);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException("Dialect class not found: " + dialectClassStr);
+ }
+ // Ensure that we are dealing with classes and not interfaces
+ if (!Object.class.isAssignableFrom(dialectBaseClazz))
+ {
+ throw new RuntimeException(
+ "Dialect base class must be derived from java.lang.Object: " +
+ dialectBaseClazz.getName());
+ }
+ if (!Object.class.isAssignableFrom(dialectClazz))
+ {
+ throw new RuntimeException(
+ "Dialect class must be derived from java.lang.Object: " +
+ dialectClazz.getName());
+ }
+ // We expect these to be in the same hierarchy
+ if (!dialectBaseClazz.isAssignableFrom(dialectClazz))
+ {
+ throw new RuntimeException(
+ "Non-existent HierarchicalResourceLoader hierarchy: " +
+ dialectBaseClazz.getName() + " is not a superclass of " + dialectClazz);
+ }
+
+ Class clazz = dialectClazz;
+ Resource resource = null;
+ while (resource == null)
+ {
+ // Do replacement
+ String newLocation = location.replaceAll(DEFAULT_DIALECT_REGEX, clazz.getName());
+ resource = super.getResource(newLocation);
+ if (resource != null && resource.exists())
+ {
+ // Found
+ break;
+ }
+ // Not found
+ resource = null;
+ // Are we at the base class?
+ if (clazz.equals(dialectBaseClazz))
+ {
+ // We don't go any further
+ break;
+ }
+ // Move up the hierarchy
+ clazz = clazz.getSuperclass();
+ if (clazz == null)
+ {
+ throw new RuntimeException(
+ "Non-existent HierarchicalResourceLoaderBean hierarchy: " +
+ dialectBaseClazz.getName() + " is not a superclass of " + dialectClazz);
+ }
+ }
+ return resource;
+ }
+}
diff --git a/src/main/java/org/alfresco/util/schemacomp/DiffContext.java b/src/main/java/org/alfresco/util/schemacomp/DiffContext.java
index ab71a915bc..3df0d18128 100644
--- a/src/main/java/org/alfresco/util/schemacomp/DiffContext.java
+++ b/src/main/java/org/alfresco/util/schemacomp/DiffContext.java
@@ -1,32 +1,32 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.util.schemacomp;
+import org.alfresco.repo.domain.dialect.Dialect;
import org.alfresco.util.schemacomp.model.Schema;
-import org.hibernate.dialect.Dialect;
/**
* A context made available to schema differencing and validation operations. It supplies information
diff --git a/src/main/java/org/alfresco/util/schemacomp/ExportDb.java b/src/main/java/org/alfresco/util/schemacomp/ExportDb.java
index 2e553c8187..2768af31cc 100644
--- a/src/main/java/org/alfresco/util/schemacomp/ExportDb.java
+++ b/src/main/java/org/alfresco/util/schemacomp/ExportDb.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.util.schemacomp;
import java.lang.reflect.Field;
@@ -35,6 +35,8 @@ import java.util.TreeMap;
import javax.sql.DataSource;
+import org.alfresco.repo.domain.dialect.Dialect;
+import org.alfresco.repo.domain.dialect.TypeNames;
import org.alfresco.service.descriptor.Descriptor;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.util.DatabaseMetaDataHelper;
@@ -48,8 +50,6 @@ import org.alfresco.util.schemacomp.model.Sequence;
import org.alfresco.util.schemacomp.model.Table;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.TypeNames;
import org.springframework.context.ApplicationContext;
@@ -172,8 +172,6 @@ public class ExportDb
}
}
}
-
-
public void execute()
{
diff --git a/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java b/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
index 1f0e1c5638..31e4992ad1 100644
--- a/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
+++ b/src/main/java/org/alfresco/util/schemacomp/SchemaComparator.java
@@ -1,33 +1,33 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.util.schemacomp;
+import org.alfresco.repo.domain.dialect.Dialect;
import org.alfresco.util.schemacomp.model.Schema;
import org.apache.xml.serialize.LineSeparator;
-import org.hibernate.dialect.Dialect;
/**
* Compares two abstract database schemas, a reference schema and a target schema (the schema to check for validity).
diff --git a/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java b/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
index 0d4f7bd68d..b9ec84a448 100644
--- a/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
+++ b/src/main/java/org/alfresco/util/schemacomp/validator/NameValidator.java
@@ -1,34 +1,35 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.util.schemacomp.validator;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern;
+import org.alfresco.repo.domain.dialect.Dialect;
import org.alfresco.util.ParameterCheck;
import org.alfresco.util.schemacomp.DbProperty;
import org.alfresco.util.schemacomp.DiffContext;
@@ -36,7 +37,6 @@ import org.alfresco.util.schemacomp.ValidationResult;
import org.alfresco.util.schemacomp.model.DbObject;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.dialect.Dialect;
import org.springframework.extensions.surf.util.I18NUtil;
/**
diff --git a/src/main/resources/alfresco/action-services-context.xml b/src/main/resources/alfresco/action-services-context.xml
index fef552606a..e7ce0542c7 100644
--- a/src/main/resources/alfresco/action-services-context.xml
+++ b/src/main/resources/alfresco/action-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -322,42 +323,42 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/activiti-context.xml b/src/main/resources/alfresco/activiti-context.xml
index 4540680fdb..2572fa3bf1 100644
--- a/src/main/resources/alfresco/activiti-context.xml
+++ b/src/main/resources/alfresco/activiti-context.xml
@@ -5,9 +5,9 @@
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
-
+
-
-
-
+
+
@@ -12,7 +14,6 @@
-
diff --git a/src/main/resources/alfresco/application-context-highlevel.xml b/src/main/resources/alfresco/application-context-highlevel.xml
index 7eba2d1e2b..009a103452 100644
--- a/src/main/resources/alfresco/application-context-highlevel.xml
+++ b/src/main/resources/alfresco/application-context-highlevel.xml
@@ -1,8 +1,10 @@
-
+
-
-
+
diff --git a/src/main/resources/alfresco/application-context.xml b/src/main/resources/alfresco/application-context.xml
index eb8dac8566..414bcf0bfc 100644
--- a/src/main/resources/alfresco/application-context.xml
+++ b/src/main/resources/alfresco/application-context.xml
@@ -1,9 +1,10 @@
-
-
-
-
+
+
-
-
- org.alfresco.repo.attributes.PropTablesCleanupJob
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -29,19 +37,4 @@
-
-
-
-
-
-
-
-
-
- ${attributes.propcleaner.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
-
-
\ No newline at end of file
diff --git a/src/main/resources/alfresco/audit-services-context.xml b/src/main/resources/alfresco/audit-services-context.xml
index f542f0b4af..229703437a 100644
--- a/src/main/resources/alfresco/audit-services-context.xml
+++ b/src/main/resources/alfresco/audit-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/authentication-services-context.xml b/src/main/resources/alfresco/authentication-services-context.xml
index 86bee7cb8b..b27b303117 100644
--- a/src/main/resources/alfresco/authentication-services-context.xml
+++ b/src/main/resources/alfresco/authentication-services-context.xml
@@ -1,6 +1,4 @@
-
-
@@ -21,8 +19,10 @@
-
-
+
diff --git a/src/main/resources/alfresco/authority-services-context.xml b/src/main/resources/alfresco/authority-services-context.xml
index 1c575d1766..59994545bb 100644
--- a/src/main/resources/alfresco/authority-services-context.xml
+++ b/src/main/resources/alfresco/authority-services-context.xml
@@ -1,6 +1,4 @@
-
-
@@ -10,7 +8,10 @@
-
+
diff --git a/src/main/resources/alfresco/blog-context.xml b/src/main/resources/alfresco/blog-context.xml
index ccbea96f92..ab9004f09a 100644
--- a/src/main/resources/alfresco/blog-context.xml
+++ b/src/main/resources/alfresco/blog-context.xml
@@ -1,7 +1,9 @@
-
+
-
@@ -12,7 +14,7 @@
-
+
@@ -120,10 +122,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/bootstrap-context.xml b/src/main/resources/alfresco/bootstrap-context.xml
index 4589c521a1..af3cea14c2 100644
--- a/src/main/resources/alfresco/bootstrap-context.xml
+++ b/src/main/resources/alfresco/bootstrap-context.xml
@@ -1,7 +1,4 @@
-
-
-
-
+
-
@@ -66,9 +63,6 @@
-
-
-
@@ -78,9 +72,6 @@
${system.maximumStringLength}
-
- ${system.hibernateMaxExecutions}
- ${db.schema.name}
@@ -107,12 +98,6 @@
-
-
-
-
-
-
@@ -131,23 +116,23 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -746,7 +731,7 @@
-
+
diff --git a/src/main/resources/alfresco/bulk-import-context.xml b/src/main/resources/alfresco/bulk-import-context.xml
index 2bfad037d5..1553c6bd73 100644
--- a/src/main/resources/alfresco/bulk-import-context.xml
+++ b/src/main/resources/alfresco/bulk-import-context.xml
@@ -5,9 +5,9 @@
xmlns:p="http://www.springframework.org/schema/p"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+ http://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/src/main/resources/alfresco/cache-context.xml b/src/main/resources/alfresco/cache-context.xml
index b7de524e9f..e6145a464f 100644
--- a/src/main/resources/alfresco/cache-context.xml
+++ b/src/main/resources/alfresco/cache-context.xml
@@ -1,11 +1,12 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/comment-services-context.xml b/src/main/resources/alfresco/comment-services-context.xml
index b23d7f3fad..f8c53a5d2c 100644
--- a/src/main/resources/alfresco/comment-services-context.xml
+++ b/src/main/resources/alfresco/comment-services-context.xml
@@ -1,7 +1,9 @@
-
+
-
@@ -31,10 +33,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/content-services-context.xml b/src/main/resources/alfresco/content-services-context.xml
index 695c22b9bf..4cb12a67e7 100644
--- a/src/main/resources/alfresco/content-services-context.xml
+++ b/src/main/resources/alfresco/content-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
-
-
-
+
diff --git a/src/main/resources/alfresco/core-services-context.xml b/src/main/resources/alfresco/core-services-context.xml
index add0fea2da..efe69da7b7 100644
--- a/src/main/resources/alfresco/core-services-context.xml
+++ b/src/main/resources/alfresco/core-services-context.xml
@@ -1,8 +1,10 @@
-
-
+
+
-
-
+
@@ -124,11 +126,11 @@
-
+
-
+
@@ -232,6 +234,15 @@
+
+
+
+
+
+
+
+
+
${db.url}
@@ -245,9 +256,6 @@
-
-
-
@@ -649,7 +657,7 @@
-
+
diff --git a/src/main/resources/alfresco/custom-model-management-services-context.xml b/src/main/resources/alfresco/custom-model-management-services-context.xml
index 4c1ee1ecd0..53b3ad217e 100644
--- a/src/main/resources/alfresco/custom-model-management-services-context.xml
+++ b/src/main/resources/alfresco/custom-model-management-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/dao/dao-context.xml b/src/main/resources/alfresco/dao/dao-context.xml
index e48997b2d8..5e2a523369 100644
--- a/src/main/resources/alfresco/dao/dao-context.xml
+++ b/src/main/resources/alfresco/dao/dao-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -11,7 +12,7 @@
org.alfresco.repo.domain.control.ControlDAO
- org.hibernate.dialect.Dialect
+ org.alfresco.repo.domain.dialect.Dialect
@@ -20,13 +21,13 @@
-
-
+ parent="controlDAO.org.alfresco.repo.domain.dialect.Dialect">
@@ -58,7 +59,7 @@
org.alfresco.repo.domain.patch.PatchDAO
- org.hibernate.dialect.Dialect
+ org.alfresco.repo.domain.dialect.Dialect
@@ -73,9 +74,9 @@
-
-
-
+
+
+
@@ -109,7 +110,7 @@
org.alfresco.repo.domain.node.NodeDAO
- org.hibernate.dialect.Dialect
+ org.alfresco.repo.domain.dialect.Dialect
@@ -141,12 +142,12 @@
-
-
-
+
+
+
-
-
+
+
@@ -185,9 +186,9 @@
-
-
-
+
+
+
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.hibernate.dialect.AlfrescoMariaDBDialect/Schema-Reference-ACT.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MariaDBDialect/Schema-Reference-ACT.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.hibernate.dialect.AlfrescoMariaDBDialect/Schema-Reference-ACT.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MariaDBDialect/Schema-Reference-ACT.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.hibernate.dialect.AlfrescoMariaDBDialect/Schema-Reference-ALF.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MariaDBDialect/Schema-Reference-ALF.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.hibernate.dialect.AlfrescoMariaDBDialect/Schema-Reference-ALF.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MariaDBDialect/Schema-Reference-ALF.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ActivityTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuditTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-AuthorizationTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-LockTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-PropertyValueTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-SubscriptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-TenantTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/AlfrescoCreate-UsageTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ACT.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ActivityTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuditTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-AuthorizationTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-ContentUrlEncryptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-LockTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-PropertyValueTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-SubscriptionTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-TenantTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/AlfrescoCreate-UsageTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ACT.xml
diff --git a/src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml b/src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
rename to src/main/resources/alfresco/dbscripts/create/org.alfresco.repo.domain.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/AclChangeSet-Tracking2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/ActivitiTaskIdIndexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/ActivitiTaskIdIndexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/ActivitiTaskIdIndexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/ActivitiTaskIdIndexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/Solr-Tracking.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/Solr-Tracking.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.Dialect/Solr-Tracking.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Solr-Tracking.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/Solr-Tracking.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/drop-activiti-feed-format.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/drop-activiti-feed-format.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/drop-activiti-feed-format.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/dropAlfQnameFKIndexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/dropAlfQnameFKIndexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/dropAlfQnameFKIndexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/fix-Repo-seqs-order.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/fix-Repo-seqs-order.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/fix-Repo-seqs-order.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/increase-column-size-activiti.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/increase-column-size-activiti.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/increase-column-size-activiti.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/increase-column-size-activiti.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/remove-column-activiti.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/remove-column-activiti.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/remove-column-activiti.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/remove-column-activiti.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/rename-constraint-activiti.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/rename-constraint-activiti.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/rename-constraint-activiti.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/rename-constraint-activiti.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/update-activiti-nullable-columns.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.Dialect/update-activiti-nullable-columns.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.Dialect/update-activiti-nullable-columns.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/ChildAssoc-OrderBy.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/NodeDeleted.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/NodeDeleted.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/NodeDeleted.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/dropAlfQnameFKIndexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/increase-column-size-activiti.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/increase-column-size-activiti.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/increase-column-size-activiti.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/increase-column-size-activiti.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/ChildAssoc-OrderBy.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/NodeDeleted.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/NodeDeleted.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/NodeDeleted.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/increase-column-size-activiti.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/increase-column-size-activiti.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/increase-column-size-activiti.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/increase-column-size-activiti.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/add-activti-index-historic-activity.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/add-activti-index-historic-activity.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/add-activti-index-historic-activity.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/add-activti-index-historic-activity.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/metadata-query-indexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/metadata-query-indexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/remove-index-acl_id.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/remove-index-acl_id.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-index-acl_id.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/remove-old-index-act.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-old-index-act.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/remove-old-index-act.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/remove-old-index-act.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.Dialect/restructure-idx_alf_nprop_s-MSSQL.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-10.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-11.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-11.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-11.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-11.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-13.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-13.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-13.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-13.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/migrate-activiti-workflows.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-activiti-workflows.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/migrate-activiti-workflows.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-activiti-workflows.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/migrate-locale-multilingual.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-old-index-act.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-old-index-act.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-old-index-act.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-old-index-act.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-10.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-11.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-11.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-11.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-11.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-13.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-13.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-13.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-13.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/migrate-activiti-workflows.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-activiti-workflows.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/migrate-activiti-workflows.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-activiti-workflows.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/migrate-locale-multilingual.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/remove-old-index-act.sql b/src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-old-index-act.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect/remove-old-index-act.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/4.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-old-index-act.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-correct-tenant-id-MSSQL.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-del-unused-after-5-16-2.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-del-unused-after-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/activiti-upgrade-5-16-4.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5-16-4.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/update-activiti-default-timestamp-column.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.Dialect/update-activiti-default-timestamp-column.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.Dialect/update-activiti-default-timestamp-column.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/update-activiti-default-timestamp-column.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.0/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-16-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.Dialect/activiti-upgrade-5.19.0.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.Dialect/activiti-upgrade-5.19.0.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/activiti-upgrade-5.19.0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.Dialect/metadata-query-indexes-2.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.Dialect/metadata-query-indexes-2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.Dialect/metadata-query-indexes-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activiti-upgrade-5-19-0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-indexes-2.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.1/org.hibernate.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.1/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activiti-upgrade-5-19-0.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/remove-jbpm-tables-from-db.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.hibernate.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql b/src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/5.2/org.hibernate.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/5.2/org.alfresco.repo.domain.dialect.PostgreSQLDialect/remove-jbpm-tables-from-db.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.hibernate.dialect.Dialect/change-set-indexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.0/org.hibernate.dialect.Dialect/change-set-indexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.Dialect/change-set-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.hibernate.dialect.MySQLInnoDBDialect/change-set-indexes.sql b/src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/upgrade/6.0/org.hibernate.dialect.MySQLInnoDBDialect/change-set-indexes.sql
rename to src/main/resources/alfresco/dbscripts/upgrade/6.0/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/change-set-indexes.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql b/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
rename to src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql b/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
rename to src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/CleanAlfPropTablesPostExec.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql b/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
rename to src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTables.sql
diff --git a/src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql b/src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
similarity index 100%
rename from src/main/resources/alfresco/dbscripts/utility/org.hibernate.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
rename to src/main/resources/alfresco/dbscripts/utility/org.alfresco.repo.domain.dialect.PostgreSQLDialect/CleanAlfPropTablesPostExec.sql
diff --git a/src/main/resources/alfresco/deprecated-context.xml b/src/main/resources/alfresco/deprecated-context.xml
index 200cd8df9f..85b07c7c79 100644
--- a/src/main/resources/alfresco/deprecated-context.xml
+++ b/src/main/resources/alfresco/deprecated-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml b/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
index e89fff0476..85c040e91d 100644
--- a/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
+++ b/src/main/resources/alfresco/deprecated-model-bootstrap-context.xml
@@ -1,9 +1,11 @@
-
-
+
diff --git a/src/main/resources/alfresco/discussions-services-context.xml b/src/main/resources/alfresco/discussions-services-context.xml
index ce6c370faf..c258b15eb9 100644
--- a/src/main/resources/alfresco/discussions-services-context.xml
+++ b/src/main/resources/alfresco/discussions-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/distributionpolicies-context.xml b/src/main/resources/alfresco/distributionpolicies-context.xml
index c55ed2cd1d..ce1a67d673 100644
--- a/src/main/resources/alfresco/distributionpolicies-context.xml
+++ b/src/main/resources/alfresco/distributionpolicies-context.xml
@@ -1,18 +1,20 @@
-
-
+
-
-
-
-
- alfresco/model/distributionPoliciesModel.xml
-
-
-
-
- alfresco/messages/distributionpolicies-model
-
-
-
+
+
+
+
+ alfresco/model/distributionPoliciesModel.xml
+
+
+
+
+ alfresco/messages/distributionpolicies-model
+
+
+
diff --git a/src/main/resources/alfresco/domain/hibernate-cfg.properties b/src/main/resources/alfresco/domain/hibernate-cfg.properties
deleted file mode 100644
index 205e518c22..0000000000
--- a/src/main/resources/alfresco/domain/hibernate-cfg.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Hibernate configuration
-#
-
-# The Hibernate Dialect:
-# As of V3.1, the dialect is automatically detected.
-# It is still possible to set the dialect explicitly, for example:
-# hibernate.dialect=org.hibernate.dialect.MySQLInnoDBDialect
-
-hibernate.jdbc.use_streams_for_binary=true
-hibernate.show_sql=false
-hibernate.cache.use_query_cache=false
-hibernate.max_fetch_depth=10
-hibernate.cache.provider_class=org.alfresco.repo.cache.DefaultCacheProvider
-hibernate.cache.use_second_level_cache=true
-hibernate.default_batch_fetch_size=1
-hibernate.jdbc.batch_size=32
-hibernate.connection.release_mode=auto
-hibernate.connection.isolation=2
-
-#hibernate.query.substitutions=
-#hibernate.jdbc.use_get_generated_keys=false
-
-# Oracle Schema Distinction:
-# See https://issues.alfresco.com/jira/browse/ETHREEOH-680
-# Metadata queries to Oracle have to be limited by schema name
-# when multiple instances of Alfresco are installed on an Oracle server.
-#hibernate.default_schema=
diff --git a/src/main/resources/alfresco/download-services-context.xml b/src/main/resources/alfresco/download-services-context.xml
index 7e94fef9b3..d427c9be49 100644
--- a/src/main/resources/alfresco/download-services-context.xml
+++ b/src/main/resources/alfresco/download-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -114,33 +115,28 @@
-
-
-
- org.alfresco.repo.download.DownloadsCleanupJob
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${download.cleaner.startDelayMins}
-
-
- ${download.cleaner.repeatIntervalMins}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/favourites-service-context.xml b/src/main/resources/alfresco/favourites-service-context.xml
index b5436cfa7c..e9f4f5ccf4 100644
--- a/src/main/resources/alfresco/favourites-service-context.xml
+++ b/src/main/resources/alfresco/favourites-service-context.xml
@@ -1,7 +1,9 @@
-
+
-
@@ -12,10 +14,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/form-services-context.xml b/src/main/resources/alfresco/form-services-context.xml
index fe9f85e74e..45080f4667 100644
--- a/src/main/resources/alfresco/form-services-context.xml
+++ b/src/main/resources/alfresco/form-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -21,10 +22,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/hibernate-context.xml b/src/main/resources/alfresco/hibernate-context.xml
deleted file mode 100644
index 532b9e57d6..0000000000
--- a/src/main/resources/alfresco/hibernate-context.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- classpath:alfresco/domain/hibernate-cfg.properties
- classpath*:alfresco/enterprise/cache/hibernate-cfg.properties
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
- classpath:alfresco/domain/cache-strategies.properties
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SYNCHRONIZATION_ALWAYS
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/resources/alfresco/ibatis/ibatis-context.xml b/src/main/resources/alfresco/ibatis/ibatis-context.xml
index f750471e18..d58d58088e 100644
--- a/src/main/resources/alfresco/ibatis/ibatis-context.xml
+++ b/src/main/resources/alfresco/ibatis/ibatis-context.xml
@@ -1,15 +1,16 @@
-
-
-
+
- org.hibernate.dialect.Dialect
+ org.alfresco.repo.domain.dialect.Dialect
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/activities-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/alfresco-util-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/alfresco-util-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/alfresco-util-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/appliedpatch-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/appliedpatch-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/appliedpatch-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/content-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/content-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/content-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/locale-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/locale-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locale-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/locks-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/metadata-query-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/metadata-query-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-delete-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-delete-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-delete-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-select-children-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-select-children-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-select-children-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-update-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/node-update-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/node-update-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/patch-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/permissions-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/permissions-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/propval-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/qname-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/qname-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/qname-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-archived-nodes-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-auditable-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-auditable-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-auditable-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-authorities-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-authorities-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-authorities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-blogs-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-blogs-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-blogs-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-calendar-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-calendar-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-calendar-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-copy-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-copy-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-copy-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-discussion-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-discussion-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-discussion-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-doclink-nodes-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-downloads-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-downloads-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-downloads-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-people-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-people-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-people-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-usages-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/query-usages-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/query-usages-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/solr-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/solr-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/subscriptions-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/subscriptions-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/subscriptions-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/tenants-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/tenants-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/usage-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.Dialect/usage-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.Dialect/usage-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/activities-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/content-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locale-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/metadata-query-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-delete-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-select-children-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/node-update-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/qname-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-authorities-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/query-people-common-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/activities-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-select-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/audit-select-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/content-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/content-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locale-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/node-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/node-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/permissions-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/qname-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml b/src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
similarity index 100%
rename from src/main/resources/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
rename to src/main/resources/alfresco/ibatis/org.alfresco.repo.domain.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
diff --git a/src/main/resources/alfresco/import-export-context.xml b/src/main/resources/alfresco/import-export-context.xml
index 74a300a141..d986471533 100644
--- a/src/main/resources/alfresco/import-export-context.xml
+++ b/src/main/resources/alfresco/import-export-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/invitation-service-context.xml b/src/main/resources/alfresco/invitation-service-context.xml
index 50d17da73b..5609f946b7 100644
--- a/src/main/resources/alfresco/invitation-service-context.xml
+++ b/src/main/resources/alfresco/invitation-service-context.xml
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
@@ -61,10 +61,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/links-services-context.xml b/src/main/resources/alfresco/links-services-context.xml
index 78fbae2dfd..96869c2242 100644
--- a/src/main/resources/alfresco/links-services-context.xml
+++ b/src/main/resources/alfresco/links-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/logging-context.xml b/src/main/resources/alfresco/logging-context.xml
index a16477a05f..b84bf535a8 100644
--- a/src/main/resources/alfresco/logging-context.xml
+++ b/src/main/resources/alfresco/logging-context.xml
@@ -1,8 +1,9 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/messages/schema-update.properties b/src/main/resources/alfresco/messages/schema-update.properties
index 89824c3aae..9ce80226bf 100644
--- a/src/main/resources/alfresco/messages/schema-update.properties
+++ b/src/main/resources/alfresco/messages/schema-update.properties
@@ -12,12 +12,8 @@ schema.update.msg.executing_generated_script=Executing database script {0} (Gene
schema.update.msg.executing_copied_script=Executing database script {0} (Copied from {1}).
schema.update.msg.executing_statement= Executing statement: {0}
schema.update.msg.optional_statement_failed=Optional statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3}
-schema.update.warn.dialect_unsupported=Alfresco should not be used with database dialect {0}.
-schema.update.warn.dialect_hsql=Alfresco is using the HSQL default database. Please only use this while evaluating Alfresco, it is NOT recommended for production or deployment!
-schema.update.warn.dialect_derby=Alfresco is using the Apache Derby default database. Please only use this while evaluating Alfresco, it is NOT recommended for production or deployment!
schema.update.warn.dialect_substituting=The dialect ''{0}'' is being changed to ''{1}''.
schema.update.err.forced_stop=The property 'stopAfterSchemaBootstrap' has been set. The bootstrap process is being terminated.
-schema.update.err.dialect_should_use=The dialect ''{0}'' is unsupported. Please use ''{1}'' instead.
schema.update.err.found_multiple=\nMore than one Alfresco schema was found when querying the database metadata.\n Limit the database user's permissions or set the 'hibernate.default_schema' property in 'custom-hibernate-dialect.properties'.
schema.update.err.previous_failed=A previous schema upgrade failed or was not completed. Revert to the original database before attempting the upgrade again.
schema.update.err.statement_failed=Statement execution failed:\n SQL: {0}\n Error: {1}\n File: {2}\n Line: {3}
diff --git a/src/main/resources/alfresco/minimal-context.xml b/src/main/resources/alfresco/minimal-context.xml
index 0736acd42c..2345194422 100644
--- a/src/main/resources/alfresco/minimal-context.xml
+++ b/src/main/resources/alfresco/minimal-context.xml
@@ -1,10 +1,11 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/module-context.xml b/src/main/resources/alfresco/module-context.xml
index 2628a0a34e..87999b274e 100644
--- a/src/main/resources/alfresco/module-context.xml
+++ b/src/main/resources/alfresco/module-context.xml
@@ -1,10 +1,11 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/mt/mt-admin-context.xml b/src/main/resources/alfresco/mt/mt-admin-context.xml
index b066fb04f2..85e732a454 100644
--- a/src/main/resources/alfresco/mt/mt-admin-context.xml
+++ b/src/main/resources/alfresco/mt/mt-admin-context.xml
@@ -1,18 +1,19 @@
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/mt/mt-base-context.xml b/src/main/resources/alfresco/mt/mt-base-context.xml
index 0c9103c128..c07a6f0ab3 100644
--- a/src/main/resources/alfresco/mt/mt-base-context.xml
+++ b/src/main/resources/alfresco/mt/mt-base-context.xml
@@ -1,18 +1,19 @@
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/network-authentication-context.xml b/src/main/resources/alfresco/network-authentication-context.xml
index 75560a5206..f04fcb1db2 100644
--- a/src/main/resources/alfresco/network-authentication-context.xml
+++ b/src/main/resources/alfresco/network-authentication-context.xml
@@ -1,7 +1,9 @@
-
-
-
+
+
diff --git a/src/main/resources/alfresco/node-locator-context.xml b/src/main/resources/alfresco/node-locator-context.xml
index 31258d6042..bfcf65c6f4 100644
--- a/src/main/resources/alfresco/node-locator-context.xml
+++ b/src/main/resources/alfresco/node-locator-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/node-services-context.xml b/src/main/resources/alfresco/node-services-context.xml
index 498db53a55..b5687c2401 100644
--- a/src/main/resources/alfresco/node-services-context.xml
+++ b/src/main/resources/alfresco/node-services-context.xml
@@ -1,8 +1,9 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/notification-services-context.xml b/src/main/resources/alfresco/notification-services-context.xml
index e7af54d45f..35e8db1ad5 100644
--- a/src/main/resources/alfresco/notification-services-context.xml
+++ b/src/main/resources/alfresco/notification-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -13,7 +14,7 @@
-
+
diff --git a/src/main/resources/alfresco/opencmis-context.xml b/src/main/resources/alfresco/opencmis-context.xml
index e2cf05c7c2..a517072adb 100644
--- a/src/main/resources/alfresco/opencmis-context.xml
+++ b/src/main/resources/alfresco/opencmis-context.xml
@@ -1,7 +1,9 @@
-
+
-
diff --git a/src/main/resources/alfresco/opencmis-qnamefilter-context.xml b/src/main/resources/alfresco/opencmis-qnamefilter-context.xml
index d3f519b81f..246818cbaa 100644
--- a/src/main/resources/alfresco/opencmis-qnamefilter-context.xml
+++ b/src/main/resources/alfresco/opencmis-qnamefilter-context.xml
@@ -1,7 +1,9 @@
-
+
-
diff --git a/src/main/resources/alfresco/ownable-services-context.xml b/src/main/resources/alfresco/ownable-services-context.xml
index ba81a91c10..1228c5c516 100644
--- a/src/main/resources/alfresco/ownable-services-context.xml
+++ b/src/main/resources/alfresco/ownable-services-context.xml
@@ -1,7 +1,9 @@
-
+
-
diff --git a/src/main/resources/alfresco/patch/patch-services-context.xml b/src/main/resources/alfresco/patch/patch-services-context.xml
index ade6f49c71..c9a4675f0d 100644
--- a/src/main/resources/alfresco/patch/patch-services-context.xml
+++ b/src/main/resources/alfresco/patch/patch-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -10,7 +11,7 @@
-
+
diff --git a/src/main/resources/alfresco/period-type-context.xml b/src/main/resources/alfresco/period-type-context.xml
index 5d51e9ad11..da6e1aacda 100644
--- a/src/main/resources/alfresco/period-type-context.xml
+++ b/src/main/resources/alfresco/period-type-context.xml
@@ -1,12 +1,13 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/policy-context.xml b/src/main/resources/alfresco/policy-context.xml
index dd1e674975..137c26f12a 100644
--- a/src/main/resources/alfresco/policy-context.xml
+++ b/src/main/resources/alfresco/policy-context.xml
@@ -1,7 +1,9 @@
-
+
-
diff --git a/src/main/resources/alfresco/preference-service-context.xml b/src/main/resources/alfresco/preference-service-context.xml
index 1536c026c1..ffb8523394 100644
--- a/src/main/resources/alfresco/preference-service-context.xml
+++ b/src/main/resources/alfresco/preference-service-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -13,10 +14,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/public-services-context.xml b/src/main/resources/alfresco/public-services-context.xml
index bc70ac2aa8..4ae14cfdaf 100644
--- a/src/main/resources/alfresco/public-services-context.xml
+++ b/src/main/resources/alfresco/public-services-context.xml
@@ -1,7 +1,9 @@
-
+
-
@@ -23,7 +25,7 @@
-
+
@@ -71,9 +73,9 @@
-
-
-
+
+
+
@@ -133,9 +135,9 @@
-
-
-
+
+
+
@@ -175,9 +177,9 @@
-
-
-
+
+
+
@@ -192,9 +194,9 @@
-
-
-
+
+
+
@@ -222,9 +224,9 @@
-
-
-
+
+
+
@@ -252,9 +254,9 @@
-
-
-
+
+
+
@@ -282,9 +284,9 @@
-
-
-
+
+
+
@@ -329,9 +331,9 @@
-
-
-
+
+
+
@@ -360,9 +362,9 @@
-
-
-
+
+
+
@@ -390,9 +392,9 @@
-
-
-
+
+
+
@@ -420,9 +422,9 @@
-
-
-
+
+
+
@@ -450,8 +452,8 @@
-
-
+
+
@@ -478,9 +480,9 @@
-
-
-
+
+
+
@@ -508,9 +510,9 @@
-
-
-
+
+
+
@@ -538,9 +540,9 @@
-
-
-
+
+
+
@@ -568,9 +570,9 @@
-
-
-
+
+
+
@@ -598,9 +600,9 @@
-
-
-
+
+
+
@@ -628,9 +630,9 @@
-
-
-
+
+
+
@@ -659,9 +661,9 @@
-
-
-
+
+
+
@@ -697,9 +699,9 @@
-
-
-
+
+
+
@@ -727,9 +729,9 @@
-
-
-
+
+
+
@@ -756,10 +758,10 @@
-
+
-
-
+
+
@@ -854,9 +856,9 @@
-
-
-
+
+
+
@@ -884,9 +886,9 @@
-
-
-
+
+
+
@@ -915,8 +917,8 @@
-
-
+
+
@@ -947,7 +949,7 @@
-
+
@@ -975,7 +977,7 @@
-
+
@@ -1004,7 +1006,7 @@
-
+
@@ -1032,7 +1034,7 @@
-
+
@@ -1060,15 +1062,16 @@
-
-
-
+
+
+
-
+
+
@@ -1089,10 +1092,10 @@
-
+
-
+
@@ -1121,9 +1124,9 @@
-
-
-
+
+
+
@@ -1152,8 +1155,8 @@
-
-
+
+
@@ -1178,8 +1181,8 @@
-
-
+
+
diff --git a/src/main/resources/alfresco/public-services-security-context.xml b/src/main/resources/alfresco/public-services-security-context.xml
index 733ce49e9d..2165c7ca78 100644
--- a/src/main/resources/alfresco/public-services-security-context.xml
+++ b/src/main/resources/alfresco/public-services-security-context.xml
@@ -1,5 +1,4 @@
-
@@ -10,7 +9,10 @@
-
+
@@ -160,8 +162,7 @@
-
+ ROLE_
@@ -171,8 +172,7 @@
-
+ GROUP_
@@ -188,8 +188,7 @@
-
+
@@ -222,9 +221,9 @@
false
-
-
-
+
+
+
@@ -233,8 +232,7 @@
-
+
@@ -271,7 +269,7 @@
-
+
@@ -377,8 +375,8 @@
-
-
+
+
org.alfresco.service.cmr.repository.NodeService.getStores=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -438,8 +436,8 @@
-
-
+
+
org.alfresco.service.cmr.model.FileFolderService.list=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -486,8 +484,8 @@
-
-
+
+
org.alfresco.service.cmr.repository.ContentService.getStoreTotalSpace=ACL_ALLOW
@@ -523,8 +521,8 @@
-
-
+
+
org.alfresco.service.cmr.search.SearchService.query=ACL_ALLOW,AFTER_ACL_NODE.sys:base.Read
@@ -539,8 +537,8 @@
-
-
+
+
org.alfresco.service.cmr.search.StatsService.query=ACL_ALLOW,AFTER_ACL_NODE.sys:base.Read
@@ -559,8 +557,8 @@
-
-
+
+
org.alfresco.service.cmr.search.CategoryService.getChildren=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -589,8 +587,8 @@
-
-
+
+
org.alfresco.service.cmr.repository.CopyService.copy=ACL_ALLOW
@@ -617,8 +615,8 @@
-
-
+
+
org.alfresco.service.cmr.lock.LockService.lock=ACL_NODE.0.cm:lockable.Lock
@@ -653,8 +651,8 @@
-
-
+
+
org.alfresco.service.cmr.ml.MultilingualContentService.getTranslationContainer=ACL_ALLOW
@@ -681,8 +679,8 @@
-
-
+
+
org.alfresco.service.cmr.ml.EditionService.createEdition=ACL_NODE.0.sys:base.Read
@@ -705,8 +703,8 @@
-
-
+
+
org.alfresco.service.cmr.coci.CheckOutCheckInService.checkout=ACL_NODE.0.cm:lockable.CheckOut
@@ -757,8 +755,8 @@
-
-
+
+
org.alfresco.service.cmr.security.PermissionService.getOwnerAuthority=ACL_ALLOW
@@ -790,8 +788,8 @@
-
-
+
+
org.alfresco.service.cmr.security.AuthorityService.hasAdminAuthority=ACL_ALLOW
@@ -847,8 +845,8 @@
-
-
+
+
org.alfresco.service.cmr.security.MutableAuthenticationService.isAuthenticationMutable=ACL_ALLOW
@@ -884,8 +882,8 @@
-
-
+
+
org.alfresco.service.cmr.security.OwnableService.getOwner=ACL_NODE.0.sys:base.ReadProperties
@@ -902,8 +900,8 @@
-
-
+
+
org.alfresco.service.cmr.security.PersonService.getPerson=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -971,8 +969,8 @@
-
-
+
+
org.alfresco.service.cmr.audit.AuditService.*=ACL_METHOD.ROLE_ADMINISTRATOR
@@ -1006,8 +1004,8 @@
-
-
+
+
org.alfresco.service.cmr.site.SiteService.cleanSitePermissions=ACL_NODE.0.sys:base.ReadProperties
@@ -1065,8 +1063,8 @@
-
-
+
+
org.alfresco.service.cmr.calendar.CalendarService.listCalendarEntries=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -1092,8 +1090,8 @@
-
-
+
+
org.alfresco.service.cmr.download.DownloadService.deleteDownloads=ACL_ALLOW
@@ -1118,8 +1116,8 @@
-
-
+
+
org.alfresco.service.cmr.links.LinksService.listLinks=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -1144,8 +1142,8 @@
-
-
+
+
org.alfresco.service.cmr.discussion.DiscussionService.listPosts=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
@@ -1177,8 +1175,8 @@
-
-
+
+
org.alfresco.service.cmr.admin.RepoAdminService.getRestrictions=ACL_ALLOW
@@ -1200,10 +1198,10 @@
-
+
-
+ org.alfresco.service.cmr.security.PublicServiceAccessService.hasAccess=ACL_ALLOW
@@ -1236,10 +1234,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/quickshare-services-context.xml b/src/main/resources/alfresco/quickshare-services-context.xml
index 0c568b5ffb..f0493575d2 100644
--- a/src/main/resources/alfresco/quickshare-services-context.xml
+++ b/src/main/resources/alfresco/quickshare-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/rating-services-context.xml b/src/main/resources/alfresco/rating-services-context.xml
index c03cb25c0a..b28c1c8650 100644
--- a/src/main/resources/alfresco/rating-services-context.xml
+++ b/src/main/resources/alfresco/rating-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -13,10 +14,10 @@
-
+
-
+
@@ -41,7 +42,7 @@
-
+
diff --git a/src/main/resources/alfresco/remote-credentials-services-context.xml b/src/main/resources/alfresco/remote-credentials-services-context.xml
index 4efbdd42b1..6e2891fbd9 100644
--- a/src/main/resources/alfresco/remote-credentials-services-context.xml
+++ b/src/main/resources/alfresco/remote-credentials-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/remote-ticket-services-context.xml b/src/main/resources/alfresco/remote-ticket-services-context.xml
index 2277cc5757..33af09bc73 100644
--- a/src/main/resources/alfresco/remote-ticket-services-context.xml
+++ b/src/main/resources/alfresco/remote-ticket-services-context.xml
@@ -5,8 +5,8 @@
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
diff --git a/src/main/resources/alfresco/rendition-services-context.xml b/src/main/resources/alfresco/rendition-services-context.xml
index ba0c7d2e3f..e0bc87f687 100644
--- a/src/main/resources/alfresco/rendition-services-context.xml
+++ b/src/main/resources/alfresco/rendition-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -14,10 +15,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/replication-services-context.xml b/src/main/resources/alfresco/replication-services-context.xml
index 43bccb93fd..6342e5ff53 100644
--- a/src/main/resources/alfresco/replication-services-context.xml
+++ b/src/main/resources/alfresco/replication-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -32,10 +33,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/repo-admin-context.xml b/src/main/resources/alfresco/repo-admin-context.xml
index 2fe39090f5..dc78e5dfa8 100644
--- a/src/main/resources/alfresco/repo-admin-context.xml
+++ b/src/main/resources/alfresco/repo-admin-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/repo-clients-apps-context.xml b/src/main/resources/alfresco/repo-clients-apps-context.xml
index 79383c4e40..596834a42a 100644
--- a/src/main/resources/alfresco/repo-clients-apps-context.xml
+++ b/src/main/resources/alfresco/repo-clients-apps-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/repository.properties b/src/main/resources/alfresco/repository.properties
index fecaa7d188..0fccd0ec44 100644
--- a/src/main/resources/alfresco/repository.properties
+++ b/src/main/resources/alfresco/repository.properties
@@ -964,8 +964,8 @@ ticket.cleanup.cronExpression=0 0 * * * ?
#
# Download Service Cleanup
#
-download.cleaner.startDelayMins=60
-download.cleaner.repeatIntervalMins=60
+download.cleaner.startDelayMilliseconds=3600000
+download.cleaner.repeatIntervalSeconds=3600
download.cleaner.maxAgeMins=60
#
@@ -1062,7 +1062,7 @@ system.remove-jbpm-tables-from-db.ignored=true
people.search.honor.hint.useCQ=true
# Delays cron jobs after bootstrap to allow server to fully come up before jobs start
-system.cronJob.startDelayMinutes=1
+system.cronJob.startDelayMilliseconds=60000
#
# Check that the declared mimetype (of the Node) is the same as the derived
diff --git a/src/main/resources/alfresco/reset-password-context.xml b/src/main/resources/alfresco/reset-password-context.xml
index 3c3375de72..f979d6e811 100644
--- a/src/main/resources/alfresco/reset-password-context.xml
+++ b/src/main/resources/alfresco/reset-password-context.xml
@@ -1,8 +1,10 @@
-
+
-
diff --git a/src/main/resources/alfresco/rule-services-context.xml b/src/main/resources/alfresco/rule-services-context.xml
index 530218037c..9bd4ace992 100644
--- a/src/main/resources/alfresco/rule-services-context.xml
+++ b/src/main/resources/alfresco/rule-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/scheduled-jobs-context.xml b/src/main/resources/alfresco/scheduled-jobs-context.xml
index de72dbbbb3..057dfd05de 100644
--- a/src/main/resources/alfresco/scheduled-jobs-context.xml
+++ b/src/main/resources/alfresco/scheduled-jobs-context.xml
@@ -1,355 +1,226 @@
-
+
-
-
-
-
-
-
-
-
- org.alfresco.util.TempFileProvider$TempFileCleanerJob
-
-
-
-
-
-
-
-
-
-
-
- 0 30 * * * ?
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
-
-
- org.alfresco.util.TempFileProvider$TempFileCleanerJob
-
-
-
-
-
-
-
-
-
-
-
- 0 0 * * * ?
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
- org.alfresco.repo.content.cleanup.ContentStoreCleanupJob
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${system.content.orphanCleanup.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
- org.alfresco.repo.admin.patch.impl.SharedFolderPatch$SharedFolderPatchJob
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${system.patch.sharedFolder.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- org.alfresco.repo.node.cleanup.NodeCleanupJob
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0 0 21 * * ?
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
-
-
-
- org.alfresco.repo.usage.UserUsageCollapseJob
-
-
-
-
-
-
-
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- org.alfresco.repo.tagging.UpdateTagScopesQuartzJob
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
- 2
-
-
- 60
+
+
+
+
+
+
-
-
-
-
- org.alfresco.repo.security.authentication.TicketCleanupJob
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
- ${ticket.cleanup.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
-
-
-
-
- org.alfresco.repo.admin.patch.AsynchronousPatch$AsynchronousPatchJob
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
- ${system.patch.surfConfigFolder.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- org.alfresco.repo.admin.patch.AsynchronousPatch$AsynchronousPatchJob
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
- ${system.patch.addUnmovableAspect.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
-
-
-
-
- org.alfresco.repo.domain.permissions.FixedAclUpdaterJob
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ${system.cronJob.startDelayMinutes}
-
-
-
+
diff --git a/src/main/resources/alfresco/scheduler-core-context.xml b/src/main/resources/alfresco/scheduler-core-context.xml
index be591d6038..b20f2305de 100644
--- a/src/main/resources/alfresco/scheduler-core-context.xml
+++ b/src/main/resources/alfresco/scheduler-core-context.xml
@@ -1,7 +1,9 @@
-
+
-
@@ -20,9 +22,10 @@
-
-
-
+
+
+
+
true
diff --git a/src/main/resources/alfresco/script-services-context.xml b/src/main/resources/alfresco/script-services-context.xml
index b736cb43ad..2a2b930696 100644
--- a/src/main/resources/alfresco/script-services-context.xml
+++ b/src/main/resources/alfresco/script-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/site-services-context.xml b/src/main/resources/alfresco/site-services-context.xml
index a46d03834a..70ed62eb4a 100644
--- a/src/main/resources/alfresco/site-services-context.xml
+++ b/src/main/resources/alfresco/site-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/slingshot-context.xml b/src/main/resources/alfresco/slingshot-context.xml
index 506460ddea..b1fb398a93 100644
--- a/src/main/resources/alfresco/slingshot-context.xml
+++ b/src/main/resources/alfresco/slingshot-context.xml
@@ -2,7 +2,8 @@
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
diff --git a/src/main/resources/alfresco/smartfolder-context.xml b/src/main/resources/alfresco/smartfolder-context.xml
index ae13ba6386..122216982d 100644
--- a/src/main/resources/alfresco/smartfolder-context.xml
+++ b/src/main/resources/alfresco/smartfolder-context.xml
@@ -1,6 +1,9 @@
-
-
+
+
diff --git a/src/main/resources/alfresco/social-publishing-context.xml b/src/main/resources/alfresco/social-publishing-context.xml
index 25c756fcea..047ef6ece5 100644
--- a/src/main/resources/alfresco/social-publishing-context.xml
+++ b/src/main/resources/alfresco/social-publishing-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/solr-facets-context.xml b/src/main/resources/alfresco/solr-facets-context.xml
index a1304381d5..20a3e227fe 100644
--- a/src/main/resources/alfresco/solr-facets-context.xml
+++ b/src/main/resources/alfresco/solr-facets-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/spring/encrypted-properties-context.xml b/src/main/resources/alfresco/spring/encrypted-properties-context.xml
index 96826b9c41..9c20afed8e 100644
--- a/src/main/resources/alfresco/spring/encrypted-properties-context.xml
+++ b/src/main/resources/alfresco/spring/encrypted-properties-context.xml
@@ -5,11 +5,9 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
-
+
-
- empty
-
-
+ empty
+
\ No newline at end of file
diff --git a/src/main/resources/alfresco/st-context.xml b/src/main/resources/alfresco/st-context.xml
index af6d58b828..af0f0082e2 100644
--- a/src/main/resources/alfresco/st-context.xml
+++ b/src/main/resources/alfresco/st-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml b/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
index 36fc9e0c79..13ef572193 100644
--- a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
+++ b/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs-context.xml
@@ -1,133 +1,132 @@
-
-
-
+
-
-
- org.alfresco.repo.activities.feed.cleanup.FeedCleanupJob
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ${activities.feed.cleaner.startDelayMins}
+
+
+
+
-
-
- org.alfresco.repo.activities.feed.FeedGeneratorJob
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ${activities.feed.generator.startDelayMins}
+
+
+
+
-
-
- org.alfresco.repo.activities.post.lookup.PostLookupJob
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ${activities.post.lookup.startDelayMins}
-
-
-
-
- org.alfresco.repo.activities.post.cleanup.PostCleanupJob
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- ${activities.post.cleaner.startDelayMins}
+
+
+
+
-
-
- org.alfresco.repo.activities.feed.FeedNotifierJob
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- ${activities.feed.notifier.startDelayMins}
-
-
-
diff --git a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties b/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
index 6081aabf53..6830a3b110 100644
--- a/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
+++ b/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-jobs.properties
@@ -8,7 +8,7 @@ activities.feed.max.ageMins=44640
# please note:
# - refer to "email/OutboundSMTP" subsystem for SMTP properties (mail.*)
# - refer to "sysAdmin" subsystem for Share url/ctx properties (share.*)
-activities.feed.notifier.startDelayMins=${system.cronJob.startDelayMinutes}
+activities.feed.notifier.startDelayMilliseconds=${system.cronJob.startDelayMilliseconds}
# Feed notification period (every 24 hours at 00:00)
activities.feed.notifier.cronExpression=0 0 0 * * ?
activities.feed.notifier.enabled=true
@@ -17,7 +17,7 @@ activities.feed.notifier.emailTemplatePath=/app:company_home/app:dictionary/app:
activities.feed.notifier.emailTemplateLocationType=xpath
# activities feed generator
-activities.feed.generator.startDelayMins=${system.cronJob.startDelayMinutes}
+activities.feed.generator.startDelayMilliseconds=${system.cronJob.startDelayMilliseconds}
activities.feed.generator.cronExpression=0/30 * * * * ?
activities.feed.generator.maxItemsPerCycle=100
activities.feed.generator.enabled=true
@@ -25,18 +25,18 @@ activities.feed.generator.batchSize=1000
activities.feed.generator.numThreads=4
# activities feed cleaner
-activities.feed.cleaner.startDelayMins=${system.cronJob.startDelayMinutes}
+activities.feed.cleaner.startDelayMilliseconds=${system.cronJob.startDelayMilliseconds}
# repeat every 10 mins
activities.feed.cleaner.cronExpression=0 0/10 * * * ?
activities.feed.cleaner.enabled=true
# activities post cleaner
-activities.post.cleaner.startDelayMins=${system.cronJob.startDelayMinutes}
+activities.post.cleaner.startDelayMilliseconds=${system.cronJob.startDelayMilliseconds}
activities.post.cleaner.cronExpression=0 0/10 * * * ?
activities.post.cleaner.enabled=true
# activities post lookup
-activities.post.lookup.startDelayMins=${system.cronJob.startDelayMinutes}
+activities.post.lookup.startDelayMilliseconds=${system.cronJob.startDelayMilliseconds}
activities.post.lookup.cronExpression=0/15 * * * * ?
activities.post.lookup.maxItemsPerCycle=500
activities.post.lookup.enabled=true
\ No newline at end of file
diff --git a/src/main/resources/alfresco/subsystems/Search/common-search-context.xml b/src/main/resources/alfresco/subsystems/Search/common-search-context.xml
index b433b88c7c..c6f317b5bb 100644
--- a/src/main/resources/alfresco/subsystems/Search/common-search-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/common-search-context.xml
@@ -1,8 +1,9 @@
-
-
-
+
@@ -30,7 +31,7 @@
-
+ ${search.solrTrackingSupport.ignorePathsForSpecificTypes}
@@ -43,7 +44,7 @@
-
+ ${search.solrTrackingSupport.ignorePathsForSpecificAspects}
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml b/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
index bba245dfd8..0443537a1e 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr/common-search-scheduler-context.xml
@@ -20,9 +20,10 @@
-
-
-
+
+
+
+
true
diff --git a/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml b/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
index 2c4259b85a..36d034b1ab 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr/solr-backup-context.xml
@@ -1,38 +1,36 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.alfresco.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
-
+
@@ -55,33 +53,19 @@
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.archive.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml b/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
index 3de15938a3..8b5e3d86e7 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr4/common-search-scheduler-context.xml
@@ -20,9 +20,10 @@
-
-
-
+
+
+
+
true
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml b/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
index 652cfe0077..0ff8fa1b0d 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr4/solr-backup-context.xml
@@ -1,35 +1,33 @@
-
+
-
-
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.alfresco.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
@@ -58,36 +56,22 @@
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.archive.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
-
+
diff --git a/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml b/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
index 64cea67b03..5f4a10e34b 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr4/solr-search-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml b/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
index 3de15938a3..8b5e3d86e7 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr6/common-search-scheduler-context.xml
@@ -20,9 +20,10 @@
-
-
-
+
+
+
+
true
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml b/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
index 652cfe0077..e904a393b7 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr6/solr-backup-context.xml
@@ -1,35 +1,33 @@
-
+
-
-
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.alfresco.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
@@ -58,33 +56,19 @@
-
-
-
- org.alfresco.repo.search.impl.solr.SolrBackupJob
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
- ${solr.backup.archive.cronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml b/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
index cb06e6dd40..d06961782c 100644
--- a/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
+++ b/src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml b/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
index f76aaa578d..c962e2de37 100644
--- a/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
+++ b/src/main/resources/alfresco/subsystems/Synchronization/default/default-synchronization-context.xml
@@ -1,38 +1,34 @@
-
+
-
-
-
-
-
- org.alfresco.repo.security.sync.UserRegistrySynchronizerJob
-
-
-
-
-
-
-
- ${synchronization.import.cron}
-
-
-
-
-
- ${system.cronJob.startDelayMinutes}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml b/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
index 300ebcfbcc..2b7edbc6ac 100644
--- a/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
+++ b/src/main/resources/alfresco/subsystems/fileServers/default/file-servers-context.xml
@@ -1,7 +1,8 @@
-
-
+
-
+
@@ -39,7 +40,7 @@
-
+
diff --git a/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml b/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
index c6e12825f6..1c613979f8 100644
--- a/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
+++ b/src/main/resources/alfresco/subsystems/fileServers/default/network-protocol-context.xml
@@ -1,7 +1,9 @@
-
-
-
+
+
@@ -77,34 +79,28 @@
${filesystem.lockKeeperEnabled}${filesystem.lockKeeperTimeout}
-
-
-
-
-
- org.alfresco.filesys.repo.LockKeeperRefreshJob
-
-
-
-
-
-
-
-
-
-
- ${filesystem.lockKeeperRefreshCronExpression}
-
-
- ${system.cronJob.startDelayMinutes}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
diff --git a/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml b/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
index c297afdf03..3d22384b06 100644
--- a/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
+++ b/src/main/resources/alfresco/subsystems/imap/default/imap-server-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -32,7 +33,7 @@
-
+
@@ -207,7 +208,7 @@
-
+
diff --git a/src/main/resources/alfresco/tagging-services-context.xml b/src/main/resources/alfresco/tagging-services-context.xml
index f639dcac83..0464b85a5f 100644
--- a/src/main/resources/alfresco/tagging-services-context.xml
+++ b/src/main/resources/alfresco/tagging-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -12,10 +13,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/template-services-context.xml b/src/main/resources/alfresco/template-services-context.xml
index f7f7ef4610..5ddb23246c 100644
--- a/src/main/resources/alfresco/template-services-context.xml
+++ b/src/main/resources/alfresco/template-services-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/thumbnail-service-context.xml b/src/main/resources/alfresco/thumbnail-service-context.xml
index c92b93aa8d..2d3eae01aa 100644
--- a/src/main/resources/alfresco/thumbnail-service-context.xml
+++ b/src/main/resources/alfresco/thumbnail-service-context.xml
@@ -3,8 +3,8 @@
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
@@ -16,10 +16,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/transfer-service-context.xml b/src/main/resources/alfresco/transfer-service-context.xml
index 0ec5ebcb27..dbc9a451ef 100644
--- a/src/main/resources/alfresco/transfer-service-context.xml
+++ b/src/main/resources/alfresco/transfer-service-context.xml
@@ -1,6 +1,9 @@
-
-
+
+
@@ -212,10 +215,10 @@
-
+
-
+
@@ -229,10 +232,10 @@
-
+
-
+
@@ -263,10 +266,10 @@
-
+
-
+
diff --git a/src/main/resources/alfresco/usage-services-context.xml b/src/main/resources/alfresco/usage-services-context.xml
index 0f4f1940b5..7a578b3775 100644
--- a/src/main/resources/alfresco/usage-services-context.xml
+++ b/src/main/resources/alfresco/usage-services-context.xml
@@ -1,8 +1,10 @@
-
-
+
diff --git a/src/main/resources/alfresco/webdav-context.xml b/src/main/resources/alfresco/webdav-context.xml
index a418000cc3..4313b6da84 100644
--- a/src/main/resources/alfresco/webdav-context.xml
+++ b/src/main/resources/alfresco/webdav-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
diff --git a/src/main/resources/alfresco/workflow-context.xml b/src/main/resources/alfresco/workflow-context.xml
index d7bc534be1..17e9e44fa0 100644
--- a/src/main/resources/alfresco/workflow-context.xml
+++ b/src/main/resources/alfresco/workflow-context.xml
@@ -1,7 +1,8 @@
-
-
-
+
@@ -132,7 +133,7 @@
-
+
diff --git a/src/test/java/org/alfresco/AllUnitTestsSuite.java b/src/test/java/org/alfresco/AllUnitTestsSuite.java
index 8d1e60fbe0..34e767d470 100644
--- a/src/test/java/org/alfresco/AllUnitTestsSuite.java
+++ b/src/test/java/org/alfresco/AllUnitTestsSuite.java
@@ -193,7 +193,12 @@ import org.junit.runners.Suite;
org.alfresco.heartbeat.ConfigurationDataCollectorTest.class,
org.alfresco.heartbeat.InfoDataCollectorTest.class,
org.alfresco.heartbeat.ModelUsageDataCollectorTest.class,
- org.alfresco.heartbeat.SystemUsageDataCollectorTest.class
+ org.alfresco.heartbeat.SystemUsageDataCollectorTest.class,
+
+ org.alfresco.repo.domain.DialectFactoryBeanTest.class,
+ org.alfresco.util.BeanExtenderUnitTest.class,
+ org.alfresco.util.bean.HierarchicalBeanLoaderTest.class,
+ org.alfresco.util.resource.HierarchicalResourceLoaderTest.class
})
public class AllUnitTestsSuite
{
diff --git a/src/test/java/org/alfresco/AppContext04TestSuite.java b/src/test/java/org/alfresco/AppContext04TestSuite.java
index 93a51c28fe..7fc84cd396 100644
--- a/src/test/java/org/alfresco/AppContext04TestSuite.java
+++ b/src/test/java/org/alfresco/AppContext04TestSuite.java
@@ -88,7 +88,6 @@ import org.junit.runners.Suite;
org.alfresco.util.schemacomp.SchemaReferenceFileTest.class,
org.alfresco.repo.module.ModuleComponentHelperTest.class,
org.alfresco.repo.node.getchildren.GetChildrenCannedQueryTest.class,
- org.alfresco.util.CronTriggerBeanSystemTest.class,
org.alfresco.filesys.auth.cifs.CifsAuthenticatorPassthruTest.class,
// the following test fails locally - on windows
diff --git a/src/test/java/org/alfresco/AppContextExtraTestSuite.java b/src/test/java/org/alfresco/AppContextExtraTestSuite.java
index c2f35f3175..740435576a 100644
--- a/src/test/java/org/alfresco/AppContextExtraTestSuite.java
+++ b/src/test/java/org/alfresco/AppContextExtraTestSuite.java
@@ -114,6 +114,9 @@ import org.junit.runners.Suite;
org.alfresco.repo.site.SiteServiceImplMoreTest.class,
org.alfresco.util.test.junitrules.TemporarySitesTest.class,
+ // [classpath:alfresco/application-context.xml, classpath:subsystem-test-context.xml]
+ org.alfresco.repo.management.subsystems.test.SubsystemsTest.class,
+
// ======================================================================
// any other order may lead to failing tests
// ======================================================================
diff --git a/src/test/java/org/alfresco/MiscContextTestSuite.java b/src/test/java/org/alfresco/MiscContextTestSuite.java
index 306c42753b..121f001584 100644
--- a/src/test/java/org/alfresco/MiscContextTestSuite.java
+++ b/src/test/java/org/alfresco/MiscContextTestSuite.java
@@ -121,9 +121,6 @@ import org.springframework.context.ApplicationContext;
// [module/module-component-test-beans.xml]
org.alfresco.repo.module.ComponentsTest.class,
- // [alfresco/scheduler-core-context.xml, org/alfresco/util/test-scheduled-jobs-context.xml]
- org.alfresco.util.CronTriggerBeanTest.class,
-
// ----------------------------------------------------------------------
// Transformer/Rendition contexts
//
@@ -140,6 +137,8 @@ import org.springframework.context.ApplicationContext;
// this does NOT passes locally
org.alfresco.repo.rendition.RenditionServicePermissionsTest.class,
+ // [ibatis/hierarchy-test/hierarchy-test-context.xml]
+ org.alfresco.ibatis.HierarchicalSqlSessionFactoryBeanTest.class
})
public class MiscContextTestSuite
{
diff --git a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
index e41e7a07c2..66816659fe 100644
--- a/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
+++ b/src/test/java/org/alfresco/heartbeat/HBDataCollectorServiceImplTest.java
@@ -32,7 +32,9 @@ import org.alfresco.service.license.LicenseDescriptor;
import org.junit.Before;
import org.junit.Test;
import org.quartz.CronTrigger;
+import org.quartz.JobKey;
import org.quartz.Scheduler;
+import org.quartz.TriggerKey;
import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.junit.rules.ExpectedException;
@@ -279,9 +281,9 @@ public class HBDataCollectorServiceImplTest
collectorService.registerCollector(c2);
collectorService.registerCollector(c3);
- String testCron1 = ((CronTrigger) scheduler.getTrigger(triggerName1, Scheduler.DEFAULT_GROUP)).getCronExpression();
- String testCron2 = ((CronTrigger) scheduler.getTrigger(triggerName2, Scheduler.DEFAULT_GROUP)).getCronExpression();
- String testCron3 = ((CronTrigger) scheduler.getTrigger(triggerName3, Scheduler.DEFAULT_GROUP)).getCronExpression();
+ String testCron1 = ((CronTrigger) scheduler.getTrigger(new TriggerKey(triggerName1, Scheduler.DEFAULT_GROUP))).getCronExpression();
+ String testCron2 = ((CronTrigger) scheduler.getTrigger(new TriggerKey(triggerName2, Scheduler.DEFAULT_GROUP))).getCronExpression();
+ String testCron3 = ((CronTrigger) scheduler.getTrigger(new TriggerKey(triggerName3, Scheduler.DEFAULT_GROUP))).getCronExpression();
assertEquals("Cron expression doesn't match", cron1, testCron1);
assertEquals("Cron expression doesn't match", cron2, testCron2);
@@ -331,10 +333,8 @@ public class HBDataCollectorServiceImplTest
{
String jobName = "heartbeat-" + collectorId;
String triggerName = jobName + "-Trigger";
-
- String[] jobs = scheduler.getJobNames(Scheduler.DEFAULT_GROUP);
- String[] triggers = scheduler.getTriggerNames(Scheduler.DEFAULT_GROUP);
- return Arrays.asList(jobs).contains(jobName) && Arrays.asList(triggers).contains(triggerName);
+ return scheduler.checkExists(new JobKey(jobName, Scheduler.DEFAULT_GROUP))
+ && scheduler.checkExists(new TriggerKey(triggerName, Scheduler.DEFAULT_GROUP));
}
private class SimpleHBDataCollector extends HBBaseDataCollector
diff --git a/src/test/java/org/alfresco/heartbeat/HeartBeatJobTest.java b/src/test/java/org/alfresco/heartbeat/HeartBeatJobTest.java
index 81b5df8d3b..c619a450d5 100644
--- a/src/test/java/org/alfresco/heartbeat/HeartBeatJobTest.java
+++ b/src/test/java/org/alfresco/heartbeat/HeartBeatJobTest.java
@@ -28,12 +28,12 @@ package org.alfresco.heartbeat;
import org.alfresco.heartbeat.datasender.HBData;
import org.alfresco.heartbeat.datasender.HBDataSenderService;
import org.alfresco.repo.lock.JobLockService;
-import org.alfresco.repo.lock.JobLockServiceImpl;
import org.alfresco.repo.lock.LockAcquisitionException;
import org.alfresco.service.namespace.QName;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -89,16 +89,18 @@ public class HeartBeatJobTest
{
// mock the job context
JobExecutionContext mockJobExecutionContext = mock(JobExecutionContext.class);
- JobDetail jobDetail = new JobDetail();
- when(mockJobExecutionContext.getJobDetail()).thenReturn(jobDetail);
-
// create the hb collector
SimpleHBDataCollector simpleCollector = spy(new SimpleHBDataCollector("simpleCollector"));
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put("collector", simpleCollector);
jobDataMap.put("hbDataSenderService", mockDataSenderService);
jobDataMap.put("jobLockService", mockJobLockService);
- jobDetail.setJobDataMap(jobDataMap);
+ JobDetail jobDetail = JobBuilder.newJob()
+ .setJobData(jobDataMap)
+ .ofType(HeartBeatJob.class)
+ .build();
+ when(mockJobExecutionContext.getJobDetail()).thenReturn(jobDetail);
+
// collector job is not locked from an other collector
String lockToken = "locked";
@@ -162,14 +164,15 @@ public class HeartBeatJobTest
// mock the job context
JobExecutionContext mockJobExecutionContext = mock(JobExecutionContext.class);
- JobDetail jobDetail = new JobDetail();
- when(mockJobExecutionContext.getJobDetail()).thenReturn(jobDetail);
-
JobDataMap jobDataMap = new JobDataMap();
jobDataMap.put("collector", simpleCollector);
jobDataMap.put("hbDataSenderService", mockDataSenderService);
jobDataMap.put("jobLockService", mockJobLockService);
- jobDetail.setJobDataMap(jobDataMap);
+ JobDetail jobDetail = JobBuilder.newJob()
+ .setJobData(jobDataMap)
+ .ofType(HeartBeatJob.class)
+ .build();
+ when(mockJobExecutionContext.getJobDetail()).thenReturn(jobDetail);
// Simulate job lock service
String lockToken = "token";
diff --git a/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java b/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java
new file mode 100644
index 0000000000..585e291d88
--- /dev/null
+++ b/src/test/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBeanTest.java
@@ -0,0 +1,232 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.ibatis;
+
+import java.util.AbstractCollection;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.TreeSet;
+import junit.framework.TestCase;
+import org.alfresco.util.resource.HierarchicalResourceLoader;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
+/**
+ * @see HierarchicalSqlSessionFactoryBean
+ * @see HierarchicalXMLConfigBuilder
+ * @see HierarchicalResourceLoader
+ *
+ * @author Derek Hulley, janv
+ * @since 4.0
+ */
+public class HierarchicalSqlSessionFactoryBeanTest extends TestCase
+{
+ private static final String QUERY_OBJECT = Object.class.getName();
+ private static final String QUERY_ABSTRACTCOLLECTION = "org.alfresco.ibatis.abstractcollection."+AbstractCollection.class.getName().replace(".", "_");
+ private static final String QUERY_ABSTRACTLIST = "org.alfresco.ibatis.abstractlist."+AbstractList.class.getName().replace(".", "_");
+ private static final String QUERY_TREESET = "org.alfresco.ibatis.treeset."+TreeSet.class.getName().replace(".", "_");
+
+ private static Log logger = LogFactory.getLog(HierarchicalSqlSessionFactoryBeanTest.class);
+
+ private ClassPathXmlApplicationContext ctx;
+ private TestDAO testDao;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ testDao = new TestDAO();
+ testDao.setId(5L);
+ testDao.setPropOne("prop-one");
+ testDao.setPropTwo("prop-two");
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ try
+ {
+ if (ctx != null)
+ {
+ ctx.close();
+ }
+ }
+ catch (Throwable e)
+ {
+ logger.error("Failed to neatly close application context", e);
+ }
+ }
+
+ /**
+ * Pushes the dialect class into the system properties, closes an current context and
+ * recreates it; the MyBatis Configuration is then returned.
+ */
+ @SuppressWarnings("unchecked")
+ private Configuration getConfiguration(Class dialectClass) throws Exception
+ {
+ System.setProperty("hierarchy-test.dialect", dialectClass.getName());
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ ctx = null;
+ }
+ catch (Throwable e)
+ {
+ logger.error("Failed to neatly close application context", e);
+ }
+ }
+ ctx = new ClassPathXmlApplicationContext("ibatis/hierarchy-test/hierarchy-test-context.xml");
+ return ((SqlSessionFactory)ctx.getBean("mybatisConfig")).getConfiguration();
+ }
+
+ /**
+ * Check context startup and shutdown
+ */
+ public void testContextStartup() throws Exception
+ {
+ getConfiguration(TreeSet.class);
+ getConfiguration(HashSet.class);
+ getConfiguration(ArrayList.class);
+ getConfiguration(AbstractCollection.class);
+ try
+ {
+ getConfiguration(Collection.class);
+ fail("Failed to detect incompatible class hierarchy");
+ }
+ catch (Throwable e)
+ {
+ // Expected
+ }
+ }
+
+ public void testHierarchyTreeSet() throws Exception
+ {
+ Configuration mybatisConfig = getConfiguration(TreeSet.class);
+ MappedStatement stmt = mybatisConfig.getMappedStatement(QUERY_TREESET);
+ assertNotNull("Query missing for " + QUERY_TREESET + " using " + TreeSet.class, stmt);
+ try
+ {
+ mybatisConfig.getMappedStatement(QUERY_ABSTRACTCOLLECTION);
+ fail("Query not missing for " + QUERY_ABSTRACTCOLLECTION + " using " + TreeSet.class);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Expected
+ }
+ }
+
+ public void testHierarchyHashSet() throws Exception
+ {
+ Configuration mybatisConfig = getConfiguration(HashSet.class);
+ MappedStatement stmt = mybatisConfig.getMappedStatement(QUERY_ABSTRACTCOLLECTION);
+ assertNotNull("Query missing for " + QUERY_ABSTRACTCOLLECTION + " using " + HashSet.class, stmt);
+ try
+ {
+ mybatisConfig.getMappedStatement(QUERY_OBJECT);
+ fail("Query not missing for " + QUERY_OBJECT + " using " + HashSet.class);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Expected
+ }
+ }
+
+ public void testHierarchyArrayList() throws Exception
+ {
+ Configuration mybatisConfig = getConfiguration(ArrayList.class);
+ MappedStatement stmt = mybatisConfig.getMappedStatement(QUERY_ABSTRACTLIST);
+ assertNotNull("Query missing for " + QUERY_ABSTRACTLIST + " using " + ArrayList.class, stmt);
+ try
+ {
+ mybatisConfig.getMappedStatement(QUERY_ABSTRACTCOLLECTION);
+ fail("Query not missing for " + QUERY_ABSTRACTCOLLECTION + " using " + ArrayList.class);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Expected
+ }
+ }
+
+ public void testHierarchyAbstractCollection() throws Exception
+ {
+ Configuration mybatisConfig = getConfiguration(AbstractCollection.class);
+ MappedStatement stmt = mybatisConfig.getMappedStatement(QUERY_ABSTRACTCOLLECTION);
+ assertNotNull("Query missing for " + QUERY_ABSTRACTCOLLECTION + " using " + AbstractCollection.class, stmt);
+ try
+ {
+ mybatisConfig.getMappedStatement(QUERY_OBJECT);
+ fail("Query not missing for " + QUERY_OBJECT + " using " + AbstractCollection.class);
+ }
+ catch (IllegalArgumentException e)
+ {
+ // Expected
+ }
+ }
+
+ /**
+ * Helper class that iBatis will use in the test mappings
+ * @author Derek Hulley
+ */
+ public static class TestDAO
+ {
+ private Long id;
+ private String propOne;
+ private String propTwo;
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+ public String getPropOne()
+ {
+ return propOne;
+ }
+ public void setPropOne(String propOne)
+ {
+ this.propOne = propOne;
+ }
+ public String getPropTwo()
+ {
+ return propTwo;
+ }
+ public void setPropTwo(String propTwo)
+ {
+ this.propTwo = propTwo;
+ }
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java b/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
index 03c4ba7f79..5119b97003 100644
--- a/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
+++ b/src/test/java/org/alfresco/repo/action/ActionServiceImplTest.java
@@ -78,8 +78,14 @@ import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.transaction.TestTransaction;
+import org.springframework.transaction.annotation.Transactional;
/**
* Action service test
@@ -87,6 +93,9 @@ import org.springframework.context.ConfigurableApplicationContext;
* @author Roy Wetherall
*/
@Category(BaseSpringTestsCategory.class)
+@Transactional
+@ContextConfiguration({"classpath:alfresco/application-context.xml",
+ "classpath:org/alfresco/repo/action/test-action-services-context.xml"})
public class ActionServiceImplTest extends BaseAlfrescoSpringTest
{
private static final String BAD_NAME = "badName";
@@ -95,23 +104,10 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
private NodeRef folder;
private RetryingTransactionHelper transactionHelper;
- @Override
- protected String[] getConfigLocations()
+ @Before
+ public void before() throws Exception
{
- String[] existingConfigLocations = ApplicationContextHelper.CONFIG_LOCATIONS;
-
- List locations = Arrays.asList(existingConfigLocations);
- List mutableLocationsList = new ArrayList(locations);
- mutableLocationsList.add("classpath:org/alfresco/repo/action/test-action-services-context.xml");
-
- String[] result = mutableLocationsList.toArray(new String[mutableLocationsList.size()]);
- return result;
- }
-
- @Override
- protected void onSetUpInTransaction() throws Exception
- {
- super.onSetUpInTransaction();
+ super.before();
this.transactionHelper = (RetryingTransactionHelper)this.applicationContext.getBean("retryingTransactionHelper");
@@ -138,6 +134,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test getActionDefinition
*/
+ @Test
public void testGetActionDefinition()
{
ActionDefinition action = actionService.getActionDefinition(AddFeaturesActionExecuter.NAME);
@@ -151,6 +148,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test getActionDefintions
*/
+ @Test
public void testGetActionDefinitions()
{
List defintions = this.actionService.getActionDefinitions();
@@ -172,6 +170,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test getActionConditionDefinition
*/
+ @Test
public void testGetActionConditionDefinition()
{
ActionConditionDefinition condition = this.actionService.getActionConditionDefinition(NoConditionEvaluator.NAME);
@@ -186,6 +185,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
* Test getActionConditionDefinitions
*
*/
+ @Test
public void testGetActionConditionDefinitions()
{
List defintions = this.actionService.getActionConditionDefinitions();
@@ -201,6 +201,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test create action condition
*/
+ @Test
public void testCreateActionCondition()
{
ActionCondition condition = this.actionService.createActionCondition(NoConditionEvaluator.NAME);
@@ -217,7 +218,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test createCompositeAction
*/
- public void testCreateCompositeActionCondition()
+ @Test
+ public void testCreateCompositeActionCondition()
{
CompositeActionCondition action = this.actionService.createCompositeActionCondition();
assertNotNull(action);
@@ -227,6 +229,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test createAction
*/
+ @Test
public void testCreateAction()
{
Action action = this.actionService.createAction(AddFeaturesActionExecuter.NAME);
@@ -242,6 +245,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test createCompositeAction
*/
+ @Test
public void testCreateCompositeAction()
{
CompositeAction action = this.actionService.createCompositeAction();
@@ -252,6 +256,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Evaluate action
*/
+ @Test
public void testEvaluateAction()
{
Action action = this.actionService.createAction(AddFeaturesActionExecuter.NAME);
@@ -277,6 +282,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test evaluate action condition
*/
+ @Test
public void testEvaluateActionCondition()
{
ActionCondition condition = this.actionService.createActionCondition(ComparePropertyValueEvaluator.NAME);
@@ -294,7 +300,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test evaluate action condition
*/
- public void testEvaluateCompositeActionConditionWith1SubCondition()
+ @Test
+ public void testEvaluateCompositeActionConditionWith1SubCondition()
{
CompositeActionCondition compositeCondition = this.actionService.createCompositeActionCondition();
@@ -314,7 +321,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test evaluate action condition
*/
- public void testEvaluateCompositeActionConditionWith2SubConditions()
+ @Test
+ public void testEvaluateCompositeActionConditionWith2SubConditions()
{
CompositeActionCondition compositeCondition = this.actionService.createCompositeActionCondition();
@@ -356,6 +364,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test execute action
*/
+ @Test
public void testExecuteAction()
{
assertFalse(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE));
@@ -413,6 +422,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertTrue(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE));
}
+ @Test
public void testGetAndGetAllWithNoActions()
{
assertNull(this.actionService.getAction(this.nodeRef, AddFeaturesActionExecuter.NAME));
@@ -421,6 +431,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(0, actions.size());
}
+ @Test
public void testExecuteActionWithNoParameterDef()
{
Action action = this.actionService.createAction("empty-action");
@@ -432,6 +443,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
* Test saving an action with no conditions. Includes testing storage and retrieval
* of compensating actions.
*/
+ @Test
public void testSaveActionNoCondition()
{
// Create the action
@@ -513,6 +525,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
//System.out.println(NodeStoreInspector.dumpNodeStore(this.nodeService, this.testStoreRef));
}
+ @Test
public void testOwningNodeRef()
{
// Create the action
@@ -540,6 +553,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test saving an action with conditions
*/
+ @Test
public void testSaveActionWithConditions()
{
// Create the action
@@ -632,6 +646,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test saving a composite action
*/
+ @Test
public void testSaveCompositeAction()
{
Action action1 = this.actionService.createAction(AddFeaturesActionExecuter.NAME);
@@ -696,6 +711,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test remove action
*/
+ @Test
public void testRemove()
{
assertEquals(0, this.actionService.getActions(this.nodeRef).size());
@@ -713,6 +729,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(0, this.actionService.getActions(this.nodeRef).size());
}
+ @Test
public void testConditionOrder()
{
Action action = this.actionService.createAction(AddFeaturesActionExecuter.NAME);
@@ -750,6 +767,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(condition4, savedAction2.getActionCondition(2));
}
+ @Test
public void testActionOrder()
{
CompositeAction action = this.actionService.createCompositeAction();
@@ -790,6 +808,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test the action result parameter
*/
+ @Test
public void testActionResult()
{
// Create the script node reference
@@ -828,8 +847,8 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
*/
public void offtestAsyncLongRunningActionsFilter()
{
- setComplete();
- endTransaction();
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
final SleepActionExecuter sleepAction = (SleepActionExecuter)applicationContext.getBean("sleep-action");
assertNotNull(sleepAction);
@@ -904,6 +923,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test asynchronous execute action
*/
+ @Test
public void testAsyncExecuteAction()
{
assertFalse(this.nodeService.hasAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE));
@@ -913,9 +933,9 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
action.setExecuteAsynchronously(true);
this.actionService.executeAction(action, this.nodeRef);
-
- setComplete();
- endTransaction();
+
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
final NodeService finalNodeService = this.nodeService;
final NodeRef finalNodeRef = this.nodeRef;
@@ -939,6 +959,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test async composite action execution
*/
+ @Test
public void testAsyncCompositeActionExecute()
{
// Create the composite action
@@ -955,9 +976,9 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
// Execute the composite action
this.actionService.executeAction(compAction, this.nodeRef);
-
- setComplete();
- endTransaction();
+
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
final NodeService finalNodeService = this.nodeService;
final NodeRef finalNodeRef = this.nodeRef;
@@ -988,10 +1009,10 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
for (int i = 0; i < 1000; i++)
{
this.actionService.executeAction(action, this.nodeRef);
- }
-
- setComplete();
- endTransaction();
+ }
+
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
// TODO how do we assess whether the large number of actions stacked cause a problem ??
}
@@ -1071,6 +1092,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test sync failure behaviour
*/
+ @Test
public void testSyncFailureBehaviour()
{
// Create an action that is going to fail
@@ -1116,6 +1138,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Test the compensating action
*/
+ @Test
public void testCompensatingAction()
{
// Create actions that are going to fail
@@ -1142,9 +1165,9 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
this.actionService.executeAction(fatalAction, this.nodeRef);
this.actionService.executeAction(nonfatalAction, this.nodeRef);
-
- setComplete();
- endTransaction();
+
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
postAsyncActionTest(
this.transactionService,
@@ -1200,6 +1223,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* http://issues.alfresco.com/jira/browse/ALF-5027
*/
+ @Test
public void testALF5027() throws Exception
{
String userName = "bob" + GUID.generate();
@@ -1239,6 +1263,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
* execution related details such as started at,
* ended at, status and exception
*/
+ @Test
public void testExecutionTrackingDetails() {
Action action = this.actionService.createAction(AddFeaturesActionExecuter.NAME);
String actionId = action.getId();
@@ -1394,7 +1419,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
/**
* Loads this executor into the ApplicationContext, if it isn't already there
*/
- public static void registerIfNeeded(ConfigurableApplicationContext ctx)
+ public static void registerIfNeeded(ApplicationContext ctx)
{
if (!ctx.containsBean(SleepActionExecuter.NAME))
{
@@ -1403,7 +1428,7 @@ public class ActionServiceImplTest extends BaseAlfrescoSpringTest
executor.setTrackStatus(true);
executor.actionTrackingService = (ActionTrackingService) ctx.getBean("actionTrackingService");
// Register
- ctx.getBeanFactory().registerSingleton(SleepActionExecuter.NAME, executor);
+ ((ConfigurableApplicationContext) ctx).getBeanFactory().registerSingleton(SleepActionExecuter.NAME, executor);
}
}
diff --git a/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java b/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
index f57f44c811..4d9224c84f 100644
--- a/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
+++ b/src/test/java/org/alfresco/repo/action/constraint/ActionParameterConstraintTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.constraint;
import java.util.List;
@@ -32,6 +32,7 @@ import org.alfresco.repo.action.evaluator.compare.ComparePropertyValueOperation;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.action.ParameterConstraint;
import org.alfresco.util.BaseSpringTest;
+import org.junit.Before;
/**
* Action parameter constraint unit test
@@ -44,12 +45,8 @@ public class ActionParameterConstraintTest extends BaseSpringTest
private ActionService actionService;
- /**
- * @see org.springframework.test.AbstractTransactionalSpringContextTests#onSetUpInTransaction()
- */
- @SuppressWarnings("deprecation")
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
actionService = (ActionService)applicationContext.getBean("ActionService");
}
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
index d4b6d49602..1d10174e86 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/CompareMimeTypeEvaluatorTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.evaluator;
import org.alfresco.model.ContentModel;
@@ -36,12 +36,16 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Transactional;
/**
* Compare property value evaluator test
*
* @author Roy Wetherall
*/
+@Transactional
public class CompareMimeTypeEvaluatorTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -51,11 +55,8 @@ public class CompareMimeTypeEvaluatorTest extends BaseSpringTest
private NodeRef nodeRef;
private CompareMimeTypeEvaluator evaluator;
- /**
- * @see org.springframework.test.AbstractTransactionalSpringContextTests#onSetUpInTransaction()
- */
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
@@ -76,7 +77,8 @@ public class CompareMimeTypeEvaluatorTest extends BaseSpringTest
this.evaluator = (CompareMimeTypeEvaluator)this.applicationContext.getBean(CompareMimeTypeEvaluator.NAME);
}
-
+
+ @Test
public void testContentPropertyComparisons()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
index 4d3b69c0b1..9dc65eef11 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/ComparePropertyValueEvaluatorTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.evaluator;
import java.io.Serializable;
@@ -54,12 +54,17 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
/**
* Compare property value evaluator test
*
* @author Roy Wetherall
*/
+@Transactional
public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
{
private static final String TEST_TYPE_NAMESPACE = "testNamespace";
@@ -77,7 +82,8 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
private Date dateValue;
private Date afterDateValue;
private NodeRef nodeValue;
-
+
+ @Autowired
private DictionaryDAO dictionaryDAO;
private NodeService nodeService;
private ContentService contentService;
@@ -87,22 +93,8 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
private NodeRef nodeRef;
private ComparePropertyValueEvaluator evaluator;
- /**
- * Sets the meta model DAO
- *
- * @param dictionaryDAO the meta model DAO
- */
- public void setDictionaryDAO(DictionaryDAO dictionaryDAO)
- {
- this.dictionaryDAO = dictionaryDAO;
- }
-
- /**
- * @see org.springframework.test.AbstractTransactionalSpringContextTests#onSetUpInTransaction()
- */
- @SuppressWarnings("deprecation")
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
// Need to create model to contain our custom type
createTestModel();
@@ -142,7 +134,8 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
this.evaluator = (ComparePropertyValueEvaluator)this.applicationContext.getBean(ComparePropertyValueEvaluator.NAME);
}
-
+
+ @Test
public void testCheckParamDefintionWithConstraint()
{
ActionConditionDefinition def = evaluator.getActionConditionDefintion();
@@ -160,6 +153,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
/**
* Test numeric comparisions
*/
+ @Test
public void testNumericComparison()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
@@ -242,6 +236,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
/**
* Test date comparison
*/
+ @Test
public void testDateComparison()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
@@ -324,6 +319,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
/**
* Test text comparison
*/
+ @Test
public void testTextComparison()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
@@ -404,6 +400,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
/**
* Test some combinations of test file names that had been failing
*/
+ @Test
public void testTempFileNames()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
@@ -418,6 +415,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
/**
* Test comparison of properties that do not have a registered comparitor
*/
+ @Test
public void testOtherComparison()
{
NodeRef badNodeRef = new NodeRef(this.testStoreRef, "badId");
@@ -465,6 +463,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
}
+ @Test
public void testContentPropertyComparisons()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
@@ -503,6 +502,7 @@ public class ComparePropertyValueEvaluatorTest extends BaseSpringTest
}
+ @Test
public void testMultiValuedPropertyComparisons()
{
ActionConditionImpl condition = new ActionConditionImpl(GUID.generate(), ComparePropertyValueEvaluator.NAME);
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
index 7c4e482d8a..6bfcb2b1a3 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/HasAspectEvaluatorTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.evaluator;
import org.alfresco.model.ContentModel;
@@ -34,12 +34,16 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Transactional;
/**
* Is sub class evaluator test
*
* @author Roy Wetherall
*/
+@Transactional
public class HasAspectEvaluatorTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -50,9 +54,8 @@ public class HasAspectEvaluatorTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @SuppressWarnings("deprecation")
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
@@ -72,6 +75,7 @@ public class HasAspectEvaluatorTest extends BaseSpringTest
this.evaluator = (HasAspectEvaluator)this.applicationContext.getBean(HasAspectEvaluator.NAME);
}
+ @Test
public void testMandatoryParamsMissing()
{
ActionCondition condition = new ActionConditionImpl(ID, HasAspectEvaluator.NAME, null);
@@ -87,6 +91,7 @@ public class HasAspectEvaluatorTest extends BaseSpringTest
}
}
+ @Test
public void testPass()
{
this.nodeService.addAspect(this.nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
@@ -95,6 +100,7 @@ public class HasAspectEvaluatorTest extends BaseSpringTest
assertTrue(this.evaluator.evaluate(condition, this.nodeRef));
}
+ @Test
public void testFail()
{
ActionCondition condition = new ActionConditionImpl(ID, HasAspectEvaluator.NAME, null);
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
index 6929f6f921..a4cf32644d 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/HasChildEvaluatorTest.java
@@ -34,6 +34,8 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.springframework.transaction.annotation.Transactional;
/**
* Test class for {@link HasChildEvaluator}.
@@ -41,6 +43,7 @@ import org.alfresco.util.GUID;
* @author Neil McErlean
* @since 3.4
*/
+@Transactional
public class HasChildEvaluatorTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -53,9 +56,8 @@ public class HasChildEvaluatorTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @SuppressWarnings("deprecation")
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
index a12d6317ca..0ae69cd9c0 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/HasTagEvaluatorTest.java
@@ -1,47 +1,50 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.evaluator;
-import org.alfresco.model.ContentModel;
-import org.alfresco.repo.action.ActionConditionImpl;
-import org.alfresco.repo.security.authentication.AuthenticationUtil;
-import org.alfresco.service.cmr.action.ActionCondition;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.tagging.TaggingService;
-import org.alfresco.service.namespace.QName;
-import org.alfresco.util.BaseSpringTest;
-import org.alfresco.util.GUID;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.action.ActionConditionImpl;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.action.ActionCondition;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.cmr.repository.NodeService;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.tagging.TaggingService;
+import org.alfresco.service.namespace.QName;
+import org.alfresco.util.BaseSpringTest;
+import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.springframework.transaction.annotation.Transactional;
/**
* Has tag evaluator unit test
*
* @author Roy Wetherall
*/
+@Transactional
public class HasTagEvaluatorTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -53,9 +56,8 @@ public class HasTagEvaluatorTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @SuppressWarnings("deprecation")
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)applicationContext.getBean("nodeService");
this.taggingService = (TaggingService)applicationContext.getBean("taggingService");
diff --git a/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java b/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
index 8384c70a0a..b65384e9cf 100644
--- a/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
+++ b/src/test/java/org/alfresco/repo/action/evaluator/IsSubTypeEvaluatorTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.evaluator;
import org.alfresco.model.ContentModel;
@@ -34,12 +34,16 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Transactional;
/**
* Is sub class evaluator test
*
* @author Roy Wetherall
*/
+@Transactional
public class IsSubTypeEvaluatorTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -50,8 +54,8 @@ public class IsSubTypeEvaluatorTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
@@ -71,6 +75,7 @@ public class IsSubTypeEvaluatorTest extends BaseSpringTest
this.evaluator = (IsSubTypeEvaluator)this.applicationContext.getBean(IsSubTypeEvaluator.NAME);
}
+ @Test
public void testMandatoryParamsMissing()
{
ActionCondition condition = new ActionConditionImpl(ID, IsSubTypeEvaluator.NAME, null);
@@ -86,6 +91,7 @@ public class IsSubTypeEvaluatorTest extends BaseSpringTest
}
}
+ @Test
public void testPass()
{
ActionCondition condition = new ActionConditionImpl(ID, IsSubTypeEvaluator.NAME, null);
@@ -95,6 +101,7 @@ public class IsSubTypeEvaluatorTest extends BaseSpringTest
assertTrue(this.evaluator.evaluate(condition, this.nodeRef));
}
+ @Test
public void testFail()
{
ActionCondition condition = new ActionConditionImpl(ID, IsSubTypeEvaluator.NAME, null);
diff --git a/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java b/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
index 72df6d201e..d6d17005b6 100644
--- a/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
+++ b/src/test/java/org/alfresco/repo/action/executer/AddFeaturesActionExecuterTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.executer;
import java.util.List;
@@ -39,13 +39,17 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
import org.springframework.extensions.surf.util.I18NUtil;
+import org.springframework.transaction.annotation.Transactional;
/**
* Add features action execution test
*
* @author Roy Wetherall
*/
+@Transactional
public class AddFeaturesActionExecuterTest extends BaseSpringTest
{
/**
@@ -81,8 +85,8 @@ public class AddFeaturesActionExecuterTest extends BaseSpringTest
/**
* Called at the begining of all tests
*/
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
@@ -109,6 +113,7 @@ public class AddFeaturesActionExecuterTest extends BaseSpringTest
/**
* Test execution
*/
+ @Test
public void testExecution()
{
// Check that the node does not have the classifiable aspect
@@ -126,6 +131,7 @@ public class AddFeaturesActionExecuterTest extends BaseSpringTest
/**
* MNT-15802
*/
+ @Test
public void testCheckLocalizedParamDefintionWithConstraint()
{
// test for other than default locale
diff --git a/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java b/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
index 91f37b8e3c..c0dbb13824 100644
--- a/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
+++ b/src/test/java/org/alfresco/repo/action/executer/CheckOutActionExecuterTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.executer;
import org.alfresco.model.ContentModel;
@@ -36,12 +36,15 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
+import org.springframework.transaction.annotation.Transactional;
/**
* Tests checkout using action executer
*/
@Category(BaseSpringTestsCategory.class)
+@Transactional
public class CheckOutActionExecuterTest extends BaseSpringTest
{
private NodeService nodeService;
@@ -62,8 +65,8 @@ public class CheckOutActionExecuterTest extends BaseSpringTest
*/
private final static String ID = GUID.generate();
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService) this.applicationContext.getBean("nodeService");
diff --git a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java b/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
index 477c528d94..c4df229da6 100644
--- a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
+++ b/src/test/java/org/alfresco/repo/action/executer/ContentMetadataEmbedderTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.action.executer;
import java.io.IOException;
@@ -60,12 +60,16 @@ import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Transactional;
/**
* Test of the ActionExecuter for embedding metadata
*
* @author Ray Gauss II
*/
+@Transactional
public class ContentMetadataEmbedderTest extends BaseSpringTest
{
@@ -82,8 +86,8 @@ public class ContentMetadataEmbedderTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService) this.applicationContext.getBean("nodeService");
this.contentService = (ContentService) this.applicationContext.getBean("contentService");
@@ -122,6 +126,7 @@ public class ContentMetadataEmbedderTest extends BaseSpringTest
/**
* Test that a failing embedder does not destroy the original content
*/
+ @Test
public void testFailingEmbedder()
{
MetadataExtracterRegistry registry = (MetadataExtracterRegistry) applicationContext.getBean("metadataExtracterRegistry");
diff --git a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java b/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
index d06be5de93..d7ccf2a97d 100644
--- a/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
+++ b/src/test/java/org/alfresco/repo/action/executer/ContentMetadataExtracterTest.java
@@ -1,29 +1,29 @@
/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+/*
* Copyright (C) 2005 Jesper Steen M�ller
*
* This file is part of Alfresco
@@ -67,7 +67,10 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.springframework.transaction.annotation.Transactional;
/**
* Test of the ActionExecuter for extracting metadata. Note: This test makes
@@ -76,6 +79,7 @@ import org.junit.experimental.categories.Category;
* @author Jesper Steen Møller
*/
@Category(BaseSpringTestsCategory.class)
+@Transactional
public class ContentMetadataExtracterTest extends BaseSpringTest
{
protected static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog";
@@ -92,8 +96,8 @@ public class ContentMetadataExtracterTest extends BaseSpringTest
private final static String ID = GUID.generate();
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ public void before() throws Exception
{
this.nodeService = (NodeService) this.applicationContext.getBean("nodeService");
this.contentService = (ContentService) this.applicationContext.getBean("contentService");
@@ -125,6 +129,7 @@ public class ContentMetadataExtracterTest extends BaseSpringTest
/**
* Test execution of the extraction itself
*/
+ @Test
public void testFromBlanks()
{
// Test that the action writes properties when they don't exist or are
@@ -181,6 +186,7 @@ public class ContentMetadataExtracterTest extends BaseSpringTest
}
}
+ @Test
public void testUnknownProperties()
{
MetadataExtracterRegistry registry = (MetadataExtracterRegistry) applicationContext.getBean("metadataExtracterRegistry");
@@ -238,6 +244,7 @@ public class ContentMetadataExtracterTest extends BaseSpringTest
* when running with {@link ContentMetadataExtracter#setCarryAspectProperties(boolean)}
* set to false.
*/
+ @Test
public void testNullExtractedValues_ALF1823()
{
MetadataExtracterRegistry registry = (MetadataExtracterRegistry) applicationContext.getBean("metadataExtracterRegistry");
@@ -285,6 +292,7 @@ public class ContentMetadataExtracterTest extends BaseSpringTest
/**
* Test execution of the pragmatic approach
*/
+ @Test
public void testFromPartial()
{
// Test that the action does not overwrite properties that are already
diff --git a/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java b/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
index 7eeff9014c..6471762a73 100644
--- a/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
+++ b/src/test/java/org/alfresco/repo/action/executer/ExecuteAllRulesActionExecuterTest.java
@@ -51,12 +51,15 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.test_category.BaseSpringTestsCategory;
import org.alfresco.util.BaseSpringTest;
import org.alfresco.util.GUID;
+import org.junit.Before;
import org.junit.experimental.categories.Category;
import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.springframework.test.context.transaction.TestTransaction;
+import org.springframework.transaction.annotation.Transactional;
import static org.alfresco.repo.rule.RuleModel.ASPECT_IGNORE_INHERITED_RULES;
@@ -66,6 +69,7 @@ import static org.alfresco.repo.rule.RuleModel.ASPECT_IGNORE_INHERITED_RULES;
* @author Roy Wetherall
*/
@Category(BaseSpringTestsCategory.class)
+@Transactional
public class ExecuteAllRulesActionExecuterTest extends BaseSpringTest
{
/** The node service */
@@ -101,8 +105,8 @@ public class ExecuteAllRulesActionExecuterTest extends BaseSpringTest
/**
* Called at the beginning of all tests
*/
- @Override
- protected void onSetUpInTransaction() throws Exception
+ @Before
+ protected void before() throws Exception
{
this.checkOutCheckInService = (CheckOutCheckInService) this.applicationContext.getBean("checkOutCheckInService");
this.nodeService = (NodeService)this.applicationContext.getBean("nodeService");
@@ -157,8 +161,8 @@ public class ExecuteAllRulesActionExecuterTest extends BaseSpringTest
// Execute rule on document upload
ActionImpl action = new ActionImpl(null, ID, ExecuteAllRulesActionExecuter.NAME, null);
this.executer.execute(action, folder);
- setComplete();
- endTransaction();
+ TestTransaction.flagForCommit();
+ TestTransaction.end();
assertTrue(this.nodeService.hasAspect(doc, ContentModel.ASPECT_CLASSIFIABLE));
transactionHelper.doInTransaction(new RetryingTransactionCallback