You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by pi...@apache.org on 2013/06/10 19:08:02 UTC
svn commit: r1491530 - in /manifoldcf/trunk: ./ connectors/alfresco/
site/src/documentation/content/xdocs/en_US/
site/src/documentation/content/xdocs/ja_JP/ test-materials/
test-materials/alfresco-4-war/ test-materials/alfresco-4-war/jetty/
test-materi...
Author: piergiorgio
Date: Mon Jun 10 17:08:01 2013
New Revision: 1491530
URL: http://svn.apache.org/r1491530
Log:
Alfresco Connector upgraded to the latest Community version: 4.2.c (CONNECTORS-635)
Added:
manifoldcf/trunk/test-materials/alfresco-4-war/
manifoldcf/trunk/test-materials/alfresco-4-war/jetty/
manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml (with props)
manifoldcf/trunk/test-materials/alfresco-4-war/src/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties (with props)
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties (with props)
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties (with props)
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/webapp/
manifoldcf/trunk/test-materials/alfresco-4-war/src/main/webapp/WEB-INF/
Removed:
manifoldcf/trunk/test-materials/alfresco-war/
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/alfresco/build.xml
manifoldcf/trunk/connectors/alfresco/pom.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
manifoldcf/trunk/test-materials/pom.xml
manifoldcf/trunk/tests/alfresco/build.xml
manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 10 17:08:01 2013
@@ -3,6 +3,9 @@ $Id$
======================= 1.3-dev =====================
+CONNECTORS-635: Alfresco test sometimes fails; upgrade to Alfresco 4.0 recommended
+(Piergiorgio Lucidi)
+
CONNECTORS-707: Treat special character "." as meaning "no extension",
for ElasticSearch and OpenSearchServer output connectors.
(TC Tobin-Campbell, Karl Wright)
Modified: manifoldcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/build.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/build.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/build.xml Mon Jun 10 17:08:01 2013
@@ -21,7 +21,7 @@
<target name="calculate-condition">
- <available file="lib-proprietary/alfresco-web-service-client-3.4.e.jar" property="alfrescoStatus"/>
+ <available file="lib-proprietary/alfresco-web-service-client-4.2.c.jar" property="alfrescoStatus"/>
<condition property="build-present">
<isset property="alfrescoStatus"/>
</condition>
@@ -35,7 +35,7 @@
</target>
<target name="precompile-warn" depends="calculate-condition" unless="build-present">
- <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-3.4.e.jar"/>
+ <echo message="Alfresco Connector cannot be built without alfresco-web-service-client-4.2.c.jar"/>
</target>
<target name="pretest-warn" depends="calculate-testcode-condition" unless="tests-present">
@@ -91,8 +91,8 @@
</target>
<target name="build-test-materials" depends="pretest-check" if="canTest">
- <mkdir dir="build/alfresco-war"/>
- <copy todir="build/alfresco-war">
+ <mkdir dir="build/alfresco-4-war"/>
+ <copy todir="build/alfresco-4-war">
<fileset dir="test-materials-proprietary">
<include name="alfresco*.war"/>
</fileset>
@@ -100,7 +100,7 @@
</target>
<target name="download-alfresco-ws-client">
- <get src="https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/3.4.e/alfresco-web-service-client-3.4.e.jar" dest="lib-proprietary"/>
+ <get src="https://artifacts.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-web-service-client/4.2.c/alfresco-web-service-client-4.2.c.jar" dest="lib-proprietary"/>
</target>
<target name="download-dependencies" depends="download-alfresco-ws-client"/>
Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Mon Jun 10 17:08:01 2013
@@ -53,6 +53,7 @@
<url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs</url>
</repository>
</repositories>
+ <!--
<pluginRepositories>
<pluginRepository>
<id>alfresco-release</id>
@@ -66,7 +67,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+-->
<build>
<sourceDirectory>${basedir}/connector/src/main/java</sourceDirectory>
<testSourceDirectory>${basedir}/connector/src/test/java</testSourceDirectory>
@@ -223,7 +224,7 @@
<dependency>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-web-service-client</artifactId>
- <version>3.4.e</version>
+ <version>4.2.c</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Mon Jun 10 17:08:01 2013
@@ -120,7 +120,7 @@
<p>The Alfresco connector requires the Alfresco Web Services Client provided by Alfresco in order to be built. Place this jar into the directory <em>connectors/alfresco/lib-proprietary</em> before you build.
This will occur automatically if you execute the ant target "make-deps" from the ManifoldCF root directory.</p>
<p></p>
- <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-war (using "mvn package" inside the folder)
+ <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-4-war (using "mvn package" inside the folder)
into the <em>connectors/alfresco/test-materials-proprietary</em> folder. Then use the "ant test" or "mvn integration-test" for the standard build to execute integration tests.</p>
<p></p>
</section>
Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml Mon Jun 10 17:08:01 2013
@@ -120,7 +120,7 @@
<p>The Alfresco connector requires the Alfresco Web Services Client provided by Alfresco in order to be built. Place this jar into the directory <em>connectors/alfresco/lib-proprietary</em> before you build.
This will occur automatically if you execute the ant target "make-deps" from the ManifoldCF root directory.</p>
<p></p>
- <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-war (using "mvn package" inside the folder)
+ <p>To run integration tests for the connector you have to copy the alfresco.war including H2 support created by the Maven module test-materials/alfresco-4-war (using "mvn package" inside the folder)
into the <em>connectors/alfresco/test-materials-proprietary</em> folder. Then use the "ant test" or "mvn integration-test" for the standard build to execute integration tests.</p>
<p></p>
</section>
Added: manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml?rev=1491530&view=auto
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml (added)
+++ manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml Mon Jun 10 17:08:01 2013
@@ -0,0 +1,33 @@
+
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
+-->
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+ <New id="myDataSource"
+ class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>jdbc/dataSource</Arg>
+ <Arg>
+ <New class="org.h2.jdbcx.JdbcDataSource">
+ <Set name="URL">jdbc:h2:alf_data_jetty/h2_data/alf_jetty</Set>
+ <Set name="User">alfresco</Set>
+ <Set name="Password">alfresco</Set>
+ </New>
+ </Arg>
+ </New>
+</Configure>
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/jetty/jetty-env.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties?rev=1491530&view=auto
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties (added)
+++ manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties Mon Jun 10 17:08:01 2013
@@ -0,0 +1,326 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+# RUN TIME PROPERTIES
+# -------------------
+
+# Sample custom content and index data location
+# This will create alf_data Relative to appserver run folder
+# In this default file we take the property from the POM (for compatbility with local jetty and jboss deployments) but it can also be edited here.
+
+###############################
+## Common Alfresco Properties #
+###############################
+
+
+dir.root=${alfresco.data.location}
+# Allowed values are: NONE, AUTO, FULL
+index.recovery.mode=NONE
+
+# Fail or not when there are node integrity checker errors
+integrity.failOnError=true
+
+# database connection properties
+# MySQL connection (This is default and requires mysql-connector-java-5.0.3-bin.jar, which ships with the Alfresco server)
+
+db.driver=${alfresco.db.driver}
+db.url=${alfresco.db.url}
+db.username=${alfresco.db.username}
+db.password=${alfresco.db.password}
+
+db.pool.initial=10
+db.pool.max=100
+
+# Dialect is autodetected starting from 3.2
+# H2 dialect
+hibernate.dialect=${alfresco.db.hibernate.dialect}
+
+index.subsystem.name=lucene
+solr.host=localhost
+solr.port=8080
+solr.secureComms=none
+# Setting Solr backup for the future. Tweak this if needed (ideally in other env properties files)
+solr.backup.alfresco.cronExpression=0 30 2 * * ? 2050
+solr.backup.archive.cronExpression=0 30 3 * * ? 2050
+solr.backup.alfresco.remoteBackupLocation=${dir.root}/solrBackup/alfresco
+solr.backup.archive.remoteBackupLocation=${dir.root}/solrBackup/archive
+# We are in the local DEV properties file, no need for Solr backup
+solr.backup.alfresco.numberToKeep=0
+solr.backup.archive.numberToKeep=0
+
+# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disasble them / set to future date
+# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597
+# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene
+wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060
+wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060
+wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060
+
+# Fail or not when there are node integrity checker errors
+integrity.failOnError=true
+
+# database connection properties
+# MySQL connection (This is default and requires mysql-connector-java-5.0.3-bin.jar, which ships with the Alfresco server)
+
+db.driver=${alfresco.db.driver}
+db.url=${alfresco.db.url}
+db.username=${alfresco.db.username}
+db.password=${alfresco.db.password}
+db.pool.initial=10
+db.pool.max=100
+
+
+#
+# Sample custom content and index data location
+#
+#dir.root=/srv/alfresco/alf_data
+#dir.keystore=${dir.root}/keystore
+
+#
+# Sample database connection properties
+#
+#db.username=alfresco
+#db.password=alfresco
+
+#
+# External locations
+#-------------
+#ooo.exe=soffice
+#ooo.enabled=false
+#jodconverter.officeHome=./OpenOffice.org
+#jodconverter.portNumbers=8101
+#jodconverter.enabled=true
+#img.root=./ImageMagick
+#swf.exe=./bin/pdf2swf
+
+#
+# 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
+
+#
+# MySQL connection
+#
+#db.driver=org.gjt.mm.mysql.Driver
+#db.url=jdbc:mysql://localhost/alfresco?useUnicode=yes&characterEncoding=UTF-8
+
+#
+# Oracle connection
+#
+#db.driver=oracle.jdbc.OracleDriver
+#db.url=jdbc:oracle:thin:@localhost:1521:alfresco
+
+#
+# SQLServer connection
+# Requires jTDS driver version 1.2.5 and SNAPSHOT isolation mode
+# Enable TCP protocol on fixed port 1433
+# Prepare the database with:
+# ALTER DATABASE alfresco SET ALLOW_SNAPSHOT_ISOLATION ON;
+#
+#db.driver=net.sourceforge.jtds.jdbc.Driver
+#db.url=jdbc:jtds:sqlserver://localhost:1433/alfresco
+#db.txn.isolation=4096
+
+#
+# PostgreSQL connection (requires postgresql-8.2-504.jdbc3.jar or equivalent)
+#
+#db.driver=org.postgresql.Driver
+#db.url=jdbc:postgresql://localhost:5432/alfresco
+
+#
+# DB2 connection
+#
+#db.driver=com.ibm.db2.jcc.DB2Driver
+#db.url=jdbc:db2://localhost:50000/alfresco:retrieveMessagesFromServerOnGetMessage=true;
+
+#
+# Index Recovery Mode
+#-------------
+#index.recovery.mode=AUTO
+
+#
+# Outbound Email Configuration
+#-------------
+#mail.host=
+#mail.port=25
+#mail.username=anonymous
+#mail.password=
+#mail.encoding=UTF-8
+#mail.from.default=alfresco@alfresco.org
+#mail.smtp.auth=false
+
+#
+# Alfresco Email Service and Email Server
+#-------------
+
+# Enable/Disable the inbound email service. The service could be used by processes other than
+# the Email Server (e.g. direct RMI access) so this flag is independent of the Email Service.
+#-------------
+#email.inbound.enabled=true
+
+# Email Server properties
+#-------------
+#email.server.enabled=true
+#email.server.port=25
+#email.server.domain=alfresco.com
+#email.inbound.unknownUser=anonymous
+
+# A comma separated list of email REGEX patterns of allowed senders.
+# If there are any values in the list then all sender email addresses
+# must match. For example:
+# .*\@alfresco\.com, .*\@alfresco\.org
+# Allow anyone:
+#-------------
+#email.server.allowed.senders=.*
+
+#
+# The default authentication chain
+# To configure external authentication subsystems see:
+# http://wiki.alfresco.com/wiki/Alfresco_Authentication_Subsystems
+#-------------
+#authentication.chain=alfrescoNtlm1:alfrescoNtlm
+
+#
+# URL Generation Parameters (The ${localname} token is replaced by the local server name)
+#-------------
+#alfresco.context=alfresco
+#alfresco.host=${localname}
+#alfresco.port=8080
+#alfresco.protocol=http
+#
+#share.context=share
+#share.host=${localname}
+#share.port=8080
+#share.protocol=http
+
+#imap.server.enabled=true
+#imap.server.port=143
+#imap.server.host=localhost
+
+# Default value of alfresco.rmi.services.host is 0.0.0.0 which means 'listen on all adapters'.
+# This allows connections to JMX both remotely and locally.
+#
+alfresco.rmi.services.host=0.0.0.0
+
+#
+# RMI service ports for the individual services.
+# These seven services are available remotely.
+#
+# Assign individual ports for each service for best performance
+# or run several services on the same port. You can even run everything on 50500 if needed.
+#
+# Select 0 to use a random unused port.
+#
+#avm.rmi.service.port=50501
+#avmsync.rmi.service.port=50502
+#attribute.rmi.service.port=50503
+#authentication.rmi.service.port=50504
+#repo.rmi.service.port=50505
+#action.rmi.service.port=50506
+#wcm-deployment-receiver.rmi.service.port=50507
+#monitor.rmi.service.port=50508
+
+
+# Dialect is autodetected starting from 3.2
+# H2 dialect
+#hibernate.dialect=org.hibernate.dialect.H2Dialect
+
+
+# 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
+
+
+# File servers related properties
+# For local builds we disable CIFS and FTP. Edit the following property to reenable them
+smb.server.enabled=false
+smb.server.name=CFS_SHARE_LOCAL
+smb.server.domain=mycompany.com
+smb.server.bindto=127.0.0.1
+smb.tcpip.port=1445
+netbios.session.port=1139
+netbios.name.port=1137
+netbios.datagram.port=1138
+ftp.server.enabled=false
+ftp.port=1121
+ftp.authenticator=alfresco
+
+# This properties file is used to configure LDAP authentication
+# NB: The following LDAP related properties are read only in case -Denteprise mvn build property is specified
+# Wheter to allow silent deletion of users in the Alfresco UI (note: users will be then resynced in the next synchronization)
+ldap.authentication.allowDeleteUser=true
+# LDAP JNDI provider
+ldap.authentication.provider=com.sun.jndi.ldap.LdapCtxFactory
+#Â Url and protocol for LDAP server to carry authentication against
+ldap.authentication.url=ldap://ldap.mycompany.com:636
+#Â can be (simple, ssl)
+ldap.authentication.protcol=ssl
+# Credentials with full access to the directoty used
+ldap.authentication.adminUser=ou=Admin,ou=Services,o=Company
+ldap.authentication.adminPassword=secret
+#Â Wheter to allow unauthenticated guest a read only login
+ldap.authentication.guestLogin.allowed=false
+# Wheter users can be created on the fly upon successful external (e.g. LDAP) authentication. Useful to avoid user synchronization in case just uid and pwd are needed for a user
+server.transaction.allow-writes=true
+# Wheter user names are case sensitive
+user.name.caseSensitive=true
+# Wheter the synchronization process has to process duplicated users (e.g. synced users and users coming from the sync)
+personService.processDuplicates=true
+# Which action to take when processin duplicates. One of: LEAVE, SPLIT, DELETE
+personService.duplicateMode=DELETE
+#Â Which of the users (in case of SPLIT duplicates policy) should be considered valid
+personService.lastIsBest=true
+# Wheter auto created users should be considered when processing duplicates
+personService.includeAutoCreated=true
+# The query to find the people to import
+ldap.synchronisation.personQuery=(objectclass=inetOrgPerson)
+# The search base of the query to find people to import
+ldap.synchronisation.personSearchBase=ou=Identities,ou=mycompany,o=com
+# The attribute name on people objects found in LDAP to use as the uid in Alfresco
+ldap.synchronisation.userIdAttributeName=cn
+# The attribute on person objects in LDAP to map to the first name property in Alfresco
+ldap.synchronisation.userFirstNameAttributeName=givenName
+# The attribute on person objects in LDAP to map to the last name property in Alfresco
+ldap.synchronisation.userLastNameAttributeName=sn
+# The attribute on person objects in LDAP to map to the email property in Alfresco
+ldap.synchronisation.userEmailAttributeName=cn
+# The attribute on person objects in LDAP to map to the organizational id property in Alfresco
+ldap.synchronisation.userOrganizationalIdAttributeName=maildomain
+# The default home folder provider to use for people created via LDAP import
+ldap.synchronisation.defaultHomeFolderProvider=companyHomeFolderProvider
+# The query to find group objects
+ldap.synchronisation.groupQuery=(objectclass=AlfrescoGroup)
+# The search base to use to find group objects
+ldap.synchronisation.groupSearchBase=ou=AlfrescoGroups,ou=mycompany,o=com
+# The attribute on LDAP group objects to map to the gid property in Alfrecso
+ldap.synchronisation.groupIdAttributeName=cn
+# The group type in LDAP
+ldap.synchronisation.groupType=AlfrescoGroup
+# The person type in LDAP
+ldap.synchronisation.personType=inetOrgPerson
+# The attribute in LDAP on group objects that defines the DN for its members
+ldap.synchronisation.groupMemberAttributeName=member
+# The cron expression defining when people imports should take place (e.g. every evening at 22:00 hours)
+ldap.synchronisation.import.person.cron=0 0 22 * * ?
+# The cron expression defining when group imports should take place (e.g. every evening at 21:45 hours)
+ldap.synchronisation.import.group.cron=0 45 21 * * ?
+# Should all groups be cleared out at import time?
+# - this is safe as groups are not used in Alfresco for other things (unlike person objects which you should never clear out during an import)
+# - setting this to true means old group definitions will be tidied up.
+ldap.synchronisation.import.group.clearAllChildren=false
+
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/properties/local/alfresco-global.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties?rev=1491530&view=auto
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties (added)
+++ manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties Mon Jun 10 17:08:01 2013
@@ -0,0 +1,2 @@
+# You can add here custom log4j classes. This will be merged with the main log4j.properties
+# See http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#Best_Log4j_Configuration_Practices
\ No newline at end of file
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/alfresco/extension/dev-log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties?rev=1491530&view=auto
==============================================================================
--- manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties (added)
+++ manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties Mon Jun 10 17:08:01 2013
@@ -0,0 +1,265 @@
+# This is a full override of Alfresco 4.2.b log4j.properties
+# This file overwrites the alfresco.war log4j.properties
+
+# Set root logger level to error
+log4j.rootLogger=${app.log.root.level}, Console, File
+
+###### Console appender definition #######
+
+# All outputs currently set to be a ConsoleAppender.
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+
+# use log4j NDC to replace %x with tenant domain / username
+log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
+#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### File appender definition #######
+log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.File.File=${app.log.dir}alfresco.log
+log4j.appender.File.Append=true
+log4j.appender.File.DatePattern='.'yyyy-MM-dd
+log4j.appender.File.layout=org.apache.log4j.PatternLayout
+log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n
+
+###### Hibernate specific appender definition #######
+#log4j.appender.file=org.apache.log4j.FileAppender
+#log4j.appender.file.File=hibernate.log
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+###### Log level overrides #######
+
+# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit)
+# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime
+# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via
+# Log4j addLoggerMBean as long as the logger exists and has been loaded.
+
+# Hibernate
+log4j.logger.org.hibernate=error
+log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal
+log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal
+log4j.logger.org.hibernate.type=warn
+log4j.logger.org.hibernate.cfg.SettingsFactory=warn
+
+# Spring
+log4j.logger.org.springframework=warn
+# Turn off Spring remoting warnings that should really be info or debug.
+log4j.logger.org.springframework.remoting.support=error
+log4j.logger.org.springframework.util=error
+
+# Axis/WSS4J
+log4j.logger.org.apache.axis=info
+log4j.logger.org.apache.ws=info
+
+# CXF
+log4j.logger.org.apache.cxf=error
+
+# MyFaces
+log4j.logger.org.apache.myfaces.util.DebugUtils=info
+log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
+log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
+log4j.logger.org.apache.myfaces.taglib=error
+
+# OpenOfficeConnection
+log4j.logger.net.sf.jooreports.openoffice.connection=fatal
+
+# log prepared statement cache activity ###
+log4j.logger.org.hibernate.ps.PreparedStatementCache=info
+
+# Alfresco
+log4j.logger.org.alfresco=error
+log4j.logger.org.alfresco.repo.admin=info
+log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn
+log4j.logger.org.alfresco.repo.model.filefolder=warn
+log4j.logger.org.alfresco.repo.tenant=info
+log4j.logger.org.alfresco.repo.avm=info
+log4j.logger.org.alfresco.config=warn
+log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn
+log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn
+log4j.logger.org.alfresco.repo.management.subsystems=warn
+log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info
+log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn
+log4j.logger.org.alfresco.repo.security.sync=info
+log4j.logger.org.alfresco.repo.security.person=info
+
+log4j.logger.org.alfresco.sample=info
+log4j.logger.org.alfresco.web=info
+#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug
+#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug
+#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug
+#log4j.logger.org.alfresco.web.bean.clipboard=debug
+log4j.logger.org.alfresco.repo.webservice=info
+log4j.logger.org.alfresco.service.descriptor.DescriptorService=info
+#log4j.logger.org.alfresco.web.page=debug
+
+log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error
+#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info
+
+log4j.logger.org.alfresco.web.ui.common.Utils=error
+#log4j.logger.org.alfresco.web.ui.common.Utils=info
+
+log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info
+log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info
+
+# Specific patches
+log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info
+log4j.logger.org.alfresco.repo.version.VersionMigrator=info
+log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info
+
+log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info
+log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info
+log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
+log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
+log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
+log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
+log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info
+log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
+log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
+log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
+log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn
+log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn
+log4j.logger.org.alfresco.util.AbstractTriggerBean=warn
+log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info
+log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn
+
+#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug
+
+log4j.logger.org.alfresco.repo.workflow=info
+
+# CIFS server debugging
+log4j.logger.org.alfresco.smb.protocol=error
+#log4j.logger.org.alfresco.smb.protocol.auth=debug
+#log4j.logger.org.alfresco.acegi=debug
+
+# FTP server debugging
+log4j.logger.org.alfresco.ftp.protocol=error
+#log4j.logger.org.alfresco.ftp.server=debug
+
+# WebDAV debugging
+#log4j.logger.org.alfresco.webdav.protocol=debug
+log4j.logger.org.alfresco.webdav.protocol=error
+
+# NTLM servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug
+
+# Kerberos servlet filters
+#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug
+#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug
+
+# File servers
+log4j.logger.org.alfresco.fileserver=warn
+
+# Repo filesystem debug logging
+#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug
+
+# AVM filesystem debug logging
+#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug
+
+# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated
+log4j.logger.org.alfresco.repo.node.integrity=ERROR
+
+# Indexer debugging
+log4j.logger.org.alfresco.repo.search.Indexer=error
+#log4j.logger.org.alfresco.repo.search.Indexer=debug
+
+log4j.logger.org.alfresco.repo.search.impl.lucene.index=error
+log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn
+#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG
+
+# Audit debugging
+# log4j.logger.org.alfresco.repo.audit=DEBUG
+# log4j.logger.org.alfresco.repo.audit.model=DEBUG
+
+# Forms debugging
+# log4j.logger.org.alfresco.web.forms=debug
+# log4j.logger.org.chiba.xml.xforms=debug
+log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error
+log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error
+
+# Property sheet and modelling debugging
+# change to error to hide the warnings about missing properties and associations
+log4j.logger.alfresco.missingProperties=warn
+log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn
+log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn
+#log4j.logger.org.alfresco.web.ui.repo.component.property=debug
+
+# Dictionary/Model debugging
+log4j.logger.org.alfresco.repo.dictionary=warn
+log4j.logger.org.alfresco.repo.dictionary.types.period=warn
+
+# Virtualization Server Registry
+log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error
+
+# Spring context runtime property setter
+log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info
+
+# Debugging options for clustering
+log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error
+log4j.logger.org.alfresco.repo.content.replication=error
+
+#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug
+
+# Activity service
+log4j.logger.org.alfresco.repo.activities=warn
+
+# User usage tracking
+log4j.logger.org.alfresco.repo.usage=info
+
+# Sharepoint
+log4j.logger.org.alfresco.module.vti=info
+
+# Forms Engine
+log4j.logger.org.alfresco.repo.forms=info
+log4j.logger.org.alfresco.web.config.forms=info
+log4j.logger.org.alfresco.web.scripts.forms=info
+
+# CMIS
+log4j.logger.org.alfresco.opencmis=error
+log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error
+log4j.logger.org.alfresco.cmis=error
+log4j.logger.org.alfresco.cmis.dictionary=warn
+log4j.logger.org.apache.chemistry.opencmis=info
+
+# IMAP
+log4j.logger.org.alfresco.repo.imap=info
+
+# JBPM
+# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler
+log4j.logger.org.jbpm.graph.def.GraphElement=fatal
+
+#log4j.logger.org.alfresco.repo.googledocs=debug
+
+###### Scripting #######
+
+# Web Framework
+log4j.logger.org.springframework.extensions.webscripts=info
+log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn
+log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off
+
+# Repository
+log4j.logger.org.alfresco.repo.web.scripts=warn
+log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info
+log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off
+log4j.logger.org.alfresco.repo.jscript=error
+log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn
+log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info
+
+log4j.logger.org.alfresco.repo.avm.actions=info
+
+# Freemarker
+# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler
+log4j.logger.freemarker.runtime=
+
+# Metadata extraction
+log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn
+
+# Reduces PDFont error level due to ALF-7105
+log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal
+log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal
+log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal
+
+# no index support
+log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal
+log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal
\ No newline at end of file
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: manifoldcf/trunk/test-materials/alfresco-4-war/src/main/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: manifoldcf/trunk/test-materials/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/test-materials/pom.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/test-materials/pom.xml (original)
+++ manifoldcf/trunk/test-materials/pom.xml Mon Jun 10 17:08:01 2013
@@ -14,9 +14,7 @@
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.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-parent</artifactId>
@@ -27,7 +25,7 @@
<name>ManifoldCF - Test materials</name>
<packaging>pom</packaging>
<modules>
- <module>alfresco-war</module>
+ <module>alfresco-4-war</module>
</modules>
<build>
<defaultGoal>package</defaultGoal>
Modified: manifoldcf/trunk/tests/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/alfresco/build.xml?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/tests/alfresco/build.xml (original)
+++ manifoldcf/trunk/tests/alfresco/build.xml Mon Jun 10 17:08:01 2013
@@ -46,7 +46,7 @@
<jvmarg value="-DcrawlerWarPath=../../../framework/build/war/mcf-crawler-ui.war"/>
<jvmarg value="-DauthorityserviceWarPath=../../../framework/build/war/mcf-authority-service.war"/>
<jvmarg value="-DapiWarPath=../../../framework/build/war/mcf-api-service.war"/>
- <jvmarg value="-DalfrescoServerWarPath=../../../connectors/alfresco/build/alfresco-war/alfresco.war"/>
+ <jvmarg value="-DalfrescoServerWarPath=../../../connectors/alfresco/build/alfresco-4-war/alfresco.war"/>
<jvmarg value="-Xms512m"/>
<jvmarg value="-Xmx1024m"/>
<jvmarg value="-Xss1024k"/>
Modified: manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java?rev=1491530&r1=1491529&r2=1491530&view=diff
==============================================================================
--- manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java (original)
+++ manifoldcf/trunk/tests/alfresco/src/test/java/org/apache/manifoldcf/alfresco_tests/BaseDerby.java Mon Jun 10 17:08:01 2013
@@ -18,6 +18,7 @@
*/
package org.apache.manifoldcf.alfresco_tests;
+import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -76,6 +77,8 @@ public class BaseDerby extends org.apach
WebAppContext alfrescoServerApi = new WebAppContext(alfrescoServerWarPath,"/alfresco");
alfrescoServerApi.setParentLoaderPriority(false);
+ HashLoginService dummyLoginService = new HashLoginService("TEST-SECURITY-REALM");
+ alfrescoServerApi.getSecurityHandler().setLoginService(dummyLoginService);
contexts.addHandler(alfrescoServerApi);
Class h2DataSource = Thread.currentThread().getContextClassLoader().loadClass("org.h2.jdbcx.JdbcDataSource");