Merged 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4296 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4301 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4302 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4303 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/extension/custom-data-location.properties.sample

@@ -1,5 +0,0 @@
-#
-# Sample custom content and index data location
-#
-
-dir.root=/srv/alfresco/data

config/alfresco/extension/custom-hibernate-dialect.properties.sample

@@ -1,7 +1,3 @@
-# Sample Hibernate configuration to disnable Hibernate schema updates
-# Values are "validate" or "update" (default)
-#hibernate.hbm2ddl.auto=validate
-
 #
 # Sample Hibernate configuration for changing Database dialect
 # For a full list: http://www.hibernate.org/hib_docs/v3/reference/en/html_single/#configuration-optional-dialects

config/alfresco/extension/custom-repository-context.xml.sample

@@ -15,15 +15,12 @@
         </property>
         <property name="locations">
             <list>
-                <value>classpath:alfresco/alfresco-shared.properties</value>
                 <value>classpath:alfresco/repository.properties</value>
                 <value>classpath:alfresco/version.properties</value>
                 <value>classpath:alfresco/domain/transaction.properties</value>
 
-                <!-- Override data location properties -->
+                <!-- Override basic repository properties -->
-                <value>classpath:alfresco/extension/custom-data-location.properties</value>
+                <value>classpath:alfresco/extension/custom-repository.properties</value>
-                <!-- Override database connection properties -->
-                <value>classpath:alfresco/extension/custom-db-connection.properties</value>
             </list>
         </property>
     </bean>

config/alfresco/extension/custom-repository.properties.sample

@@ -1,13 +1,28 @@
+###############################
+## Common Alfresco Properties #
+###############################
+
+#
+# Sample custom content and index data location
+#
+#dir.root=/srv/alfresco/data
+
 #
 # Sample database connection properties
 #
-
-#db.schema.update=true
 #db.username=alfresco
 #db.password=alfresco
 #db.pool.initial=10
 #db.pool.max=100
 
+#
+# Property to control whether schema updates are performed automatically.
+# Updates must be enabled during upgrades as, apart from the static upgrade scripts,
+# there are also auto-generated update scripts that will need to be executed.  After
+# upgrading to a new version, this can be disabled.
+#
+#db.schema.update=true
+
 #
 # HSQL connection
 #
@@ -41,7 +56,5 @@
 #
 # SQLServer connection using Microsoft JDDB driver
 #
-#db.username=sa
-#db.password=sa
 #db.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 #db.url=jdbc:sqlserver://localhost;DatabaseName=alfresco

project-build.xml

@@ -56,7 +56,6 @@
          <lib dir="${dir.common.lib}/jmagick" includes="*.jar" />
          <lib dir="${dir.common.lib}/commons" includes="*.jar" />
          <lib dir="${dir.common.lib}/jgroups" includes="*.jar" />
-         <lib dir="${dir.common.lib}/treecache" includes="*.jar" />
          <lib dir="${dir.common.lib}/swarmcache" includes="*.jar" />
          <lib dir="${dir.dist}" includes="${file.name.jar}" />
          <lib dir="${dir.project.core}/build/dist" includes="${dir.name.core}.jar" />

source/java/org/alfresco/repo/cache/TreeCacheAdapter.java

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2005-2006 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.cache;
-
-import java.io.Serializable;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-
-/**
- * A thin adapter for <b>TreeCache</b> support.
- *
- * @author Derek Hulley
- */
-public class TreeCacheAdapter<K extends Serializable, V extends Serializable>
-        implements SimpleCache<K, V>
-{
-    private TreeCache cache;
-    private Fqn regionFqn;
-    
-    public TreeCacheAdapter()
-    {
-    }
-
-    /**
-     * @param cache the backing Ehcache instance
-     */
-    public void setCache(TreeCache cache)
-    {
-        this.cache = cache;
-    }
-
-    /**
-     * Set the uniquely named region of the cache within which all object must be cached
-     * 
-     * @param regionName the cache region
-     */
-    public void setRegionName(String regionName)
-    {
-        this.regionFqn = new Fqn(regionName);
-    }
-
-    public boolean contains(K key)
-    {
-        try
-        {
-            return cache.exists(regionFqn, key);
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("contains failed", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public V get(K key)
-    {
-        try
-        {
-            Object element = cache.get(regionFqn, key);
-            if (element != null)
-            {
-                return (V) element;
-            }
-            else
-            {
-                return null;
-            }
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Failed to get from TreeCache: \n" +
-                    "   key: " + key,
-                    e);
-        }
-    }
-
-    public void put(K key, V value)
-    {
-        try
-        {
-            cache.put(regionFqn, key, value);
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Failed to put into TreeCache: \n" +
-                    "   key: " + key + "\n" +
-                    "   value: " + value,
-                    e);
-        }
-    }
-
-    public void remove(K key)
-    {
-        try
-        {
-            cache.remove(regionFqn, key);
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Failed to remove from TreeCache: \n" +
-                    "   key: " + key,
-                    e);
-        }
-    }
-
-    public void clear()
-    {
-        try
-        {
-            cache.remove(regionFqn);
-        }
-        catch (Throwable e)
-        {
-            throw new AlfrescoRuntimeException("Failed to clear cache", e);
-        }
-    }
-}

source/java/org/alfresco/repo/cache/TreeCacheAdapterTest.java

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2005-2006 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.cache;
-
-import java.io.Serializable;
-
-import org.jboss.cache.DummyTransactionManagerLookup;
-import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-
-import junit.framework.TestCase;
-
-/**
- * @see org.alfresco.repo.cache.TreeCacheAdapter
- * 
- * @author Derek Hulley
- */
-public class TreeCacheAdapterTest extends TestCase
-{
-    private static final String KEY_A = "A";
-    private static final String VALUE_A = "AAA";
-    private static final String KEY_B = "B";
-    private static final String VALUE_B = "BBB";
-    
-    private TreeCache treeCache;
-    private TreeCacheAdapter<Serializable, Serializable> cache;
-    
-    @Override
-    public void setUp() throws Exception
-    {
-        treeCache = new TreeCache();
-        treeCache.setTransactionManagerLookupClass(DummyTransactionManagerLookup.class.getName());
-        treeCache.start();
-        
-        cache = new TreeCacheAdapter<Serializable, Serializable>();
-        cache.setCache(treeCache);
-        cache.setRegionName(getName());
-    }
-    
-    public void testSimplePutGet() throws Exception
-    {
-        cache.put(KEY_A, VALUE_A);
-        cache.put(KEY_B, VALUE_B);
-        
-        // check that this is present in the underlying cache
-        Serializable checkValueA = (Serializable) treeCache.get(new Fqn(getName()), KEY_A);
-        assertNotNull("Value A is not present in underlying cache", checkValueA);
-        assertEquals("Value A is incorrect in underlying cache", VALUE_A, checkValueA);
-        
-        Serializable checkValueB = cache.get(KEY_B);
-        assertNotNull("Value B is not present in cache", checkValueB);
-        assertEquals("Value B is incorrect in cache", VALUE_B, checkValueB);
-    }
-}

source/java/org/alfresco/repo/transaction/TransactionManagerJndiLookup.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2005-2006 Alfresco, Inc.
- *
- * Licensed under the Mozilla Public License version 1.1 
- * with a permitted attribution clause. You may obtain a
- * copy of the License at
- *
- *   http://www.alfresco.org/legal/license.txt
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the
- * License.
- */
-package org.alfresco.repo.transaction;
-
-import java.util.Properties;
-
-import javax.transaction.TransactionManager;
-
-import org.jboss.cache.TransactionManagerLookup;
-import org.springframework.jndi.JndiObjectFactoryBean;
-import org.springframework.jndi.JndiTemplate;
-
-/**
- * Helper lookup class to supply JBoss components with a <code>TransactionManager</code>.
- * <p>
- * The <code>JBossTransactionManagerLookup</code> will work when Alfresco is running in JBoss,
- * but the <code>TreeCache</code> can be used within other containers; there might not be any
- * container and the <code>TransactionManager</code> may held in a local JNDI tree.
- * <p>
- * For compatibility with other app servers, the JBoss <code>GenericTransactionManagerLookup</code>
- * could also be used.
- * <p>
- * The default constructor configures the object to look in <b>java:/TransactionManager</b>
- * for a <code>TransactionManager</code>.  The only customisation that should be required is
- * to change the {@link #setJndiName(String) jndiName} property.  If more JNDI details need
- * changing, then the actual {@link #setJndiLookup(JndiObjectFactoryBean) jndiLookup object} can
- * be substituted with a customized version.
- * 
- * @author Derek Hulley
- */
-public class TransactionManagerJndiLookup implements TransactionManagerLookup
-{
-    public static final String DEFAULT_JNDI_NAME = "java:/TransactionManager";
-    
-    private JndiObjectFactoryBean jndiLookup;
-    
-    public TransactionManagerJndiLookup()
-    {
-        jndiLookup = new JndiObjectFactoryBean();
-        jndiLookup.setJndiName(DEFAULT_JNDI_NAME);
-        jndiLookup.setProxyInterface(TransactionManager.class);
-    }
-    
-    /**
-     * @see org.springframework.jndi.JndiAccessor#setJndiTemplate(org.springframework.jndi.JndiTemplate)
-     */
-    public void setJndiTemplate(JndiTemplate jndiTemplate)
-    {
-        this.jndiLookup.setJndiTemplate(jndiTemplate);
-    }
-
-    /**
-     * @see org.springframework.jndi.JndiAccessor#setJndiEnvironment(java.util.Properties)
-     */
-    public void setJndiEnvironment(Properties jndiEnvironment)
-    {
-        this.jndiLookup.setJndiEnvironment(jndiEnvironment);
-    }
-
-    /**
-     * Set the JNDI location where the <code>TransactionManager</code> can be found.
-     * 
-     * @param jndiName
-     */
-    public void setJndiName(String jndiName)
-    {
-        jndiLookup.setJndiName(jndiName);
-    }
-
-    /**
-     * @return Returns a <code>TransactionManager</code> looked up at the JNDI location
-     */
-    public TransactionManager getTransactionManager() throws Exception
-    {
-        return (TransactionManager) jndiLookup.getObject();
-    }
-}