diff --git a/README.md b/README.md index 76126ee9..600a2982 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,43 @@ SDK for Alfresco Development, Testing, packaging and custom project lifecycle ma Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. -## SDK 2.0.0 release candidate now in staging! +## SDK 2.0.0 available in Maven Central -We are approaching the final 2.0.0 release of the SDK (compatible with Alfresco Community 5.0.c and Enterprise 5.0). If you want early access to the release candidate build and want to participate to the testing process check [this page](https://github.com/Alfresco/alfresco-sdk/wiki/SDK-Supported-Features-and-Test-plan) and report issues [here](https://github.com/Alfresco/alfresco-sdk/issues). +The SDK 2.0.0 is finally [released in Maven Central](http://search.maven.org/#search|ga|1|alfresco%20sdk). -Once the vote is closed the SDK will be available in Maven Central. +- *To create a new Alfresco project*: Run a -# Check the SDK out! +```bash +mvn archetype:generate -Dfilter=org.alfresco: +``` + +and use one of the available archetypes (AMP, Share AMP, All in One) + +- *To use the SDK in your project:* Add the below parent reference snippet to the existing project (*NOTE*: you might need folder layout changes) to inherit features from Alfresco SDK POM: + +```xml + + org.alfresco.maven + alfresco-sdk-parent + 2.0.0 + + +``` +## Resources + +### Alfresco Official Docs + +- Documentation for the SDK on Alfresco Community (latest) is available [here](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html) + +- Documentation for the SDK on Alfresco Enterprise (5.0) is available [here](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html) + +### Developer Documentation + +**SDK 2.x**: Full developer (Maven) documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html). + + + +# Check the SDK in action! For an overview of the SDK potential check out this video: @@ -26,15 +56,6 @@ The SDK is composed of: 2. [Alfresco Share AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/share-amp-archetype/index.html) 3. [Alfresco All-in-One Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html) -## Resources - -### Developer Documentation - -**SDK 2.x**: Full documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html). - -### Alfresco Official Documentation - -Additional documentation for Alfresco Community and Enterprise, tutorials and examples is available in the [Alfresco Documentation](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html). ### Samples diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 689ac617..3e700598 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -38,6 +38,7 @@ false + maven-resources-plugin diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index abf05c21..48bd1196 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -52,14 +52,9 @@ **/*.properties - - tomcat - - ** - - + @@ -86,18 +81,6 @@ ** - - src/test/properties - - **/*.properties - - - - tomcat - - ** - - @@ -118,44 +101,11 @@ - - - - src/main/solr-properties - - ** - ** - - - - src/main/webapp - - ** - - - - src/assembly - - ** - - - - src/main/resources - - ** - - - + - - src/main/properties - - **/*.properties - - src/main/resources @@ -164,6 +114,7 @@ + @@ -181,6 +132,7 @@ + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 33287af3..186cddbc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,60 +1,86 @@ - + 4.0.0 ${groupId} ${artifactId} ${version} Alfresco Repository and Share Quickstart with database and an embedded runner. - This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project - pom + This All-in-One project allows to manage all the components involved in Alfresco development (Repo, + Share, Solr4, AMPs) in one project + + pom org.alfresco.maven alfresco-sdk-parent @@alfresco.sdk.parent.version@@ - + - - - - + + + + WARN - - alf_data_dev + local - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - + + + + + + ${alfresco.groupId} + alfresco-platform-distribution + ${alfresco.version} + pom + import + + + - + + net.alchim31.maven + yuicompressor-maven-plugin + 1.5.1 + + + alfresco/**/*.* + **/*-min.js + **/*.css + + + + + + compress-js + + compress + + + + + + + + @@ -67,15 +93,15 @@ false - + rm - + 2.3.a.1 ${project.build.directory}/rm-amps ${project.build.directory}/${project.build.finalName}.war org.alfresco:${alfresco.rm.artifactId}:${alfresco.rm.version}:amp - + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml index 1c78f06f..7d67d6e8 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml @@ -13,26 +13,38 @@ - - alfresco + - + ${alfresco.groupId} alfresco-repository - + - + + + + enterprise + + + ${alfresco.groupId} + alfresco-enterprise-repository + ${alfresco.version} + provided + + + + + rm @@ -45,23 +57,12 @@ - - - enterprise - - - ${alfresco.groupId} - alfresco-enterprise-repository - ${alfresco.version} - jar - provided - - - + + run - true + true diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh deleted file mode 100644 index fc86774c..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Downloads the spring-loaded lib if not existing and runs the repository AMP -springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar - -if [ ! -f $springloadedfile ]; then -mvn validate -Psetup -fi - -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..390d68a0 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1,5 @@ +## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module. +## Define default values for all properties here. +## System Administrators can override these values in environment specific configurations in +## alfresco/tomcat/shared/classes/alfresco-global.properties. +## \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml new file mode 100644 index 00000000..e5421cc0 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + alfresco/module/${project.artifactId}/model/content-model.xml + alfresco/module/${project.artifactId}/model/workflow-model.xml + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml new file mode 100644 index 00000000..91f54ae6 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml @@ -0,0 +1,27 @@ + + + + + Document Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml new file mode 100644 index 00000000..580e3f20 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml @@ -0,0 +1,26 @@ + + + + Workflow Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml index 2111526d..bc5b538f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml @@ -15,11 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. ---> - - - - - - - +--> + + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties index 343401a2..92a689e5 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/test/properties/local/alfresco-global.properties @@ -13,23 +13,21 @@ # See the License for the specific language governing permissions and # limitations under the License. +######################################################################################################################## +# Alfresco configuration for running locally +# +# Configuration when running Tomcat embedded from Maven. +# This will create the alf_data_dev directory relative to Tomcat run folder. +# Property values from the POM but it can also be edited here. +######################################################################################################################## - -# 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. dir.root=${alfresco.data.location} -# Allowed values are: NONE, AUTO, FULL -index.recovery.mode=NONE -# This is default. Allowed values are: solr, lucene, noindex -index.subsystem.name=solr -#dir.keystore=. -#keystore.password=storepassword -#metadata.password=metapassword +# Use Solr4 as that is used by default with Alfresco 5 +index.subsystem.name=solr4 +solr.host=localhost +solr.port=8080 +solr.secureComms=none # Fail or not when there are node integrity checker errors integrity.failOnError=true @@ -41,17 +39,9 @@ db.username=${alfresco.db.username} db.password=${alfresco.db.password} db.pool.initial=10 db.pool.max=100 +hibernate.dialect=org.hibernate.dialect.H2Dialect # 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.enables=false -ftp.port=1121 -ftp.authenticator=alfresco \ No newline at end of file +# For local runs we disable CIFS and FTP +cifs.enabled=false +ftp.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml deleted file mode 100644 index 68747908..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/properties/local/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/properties/local/alfresco-global.properties index fd2e581c..63fd28de 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/properties/local/alfresco-global.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/src/main/properties/local/alfresco-global.properties @@ -15,33 +15,45 @@ # 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 # -############################### - +######################################################################################################################## +# Alfresco configuration for running locally +# +# Configuration when running Tomcat embedded from Maven. +# This will create the alf_data_dev directory relative to Tomcat run folder. +# Property values from the POM but it can also be edited here. +######################################################################################################################## dir.root=${alfresco.data.location} -# Allowed values are: NONE, AUTO, FULL -index.recovery.mode=FULL -index.subsystem.name=solr +# Alfresco Repo Webapp (alfresco.war) context, ports etc +alfresco.context=alfresco +alfresco.host=localhost +alfresco.port=8080 +alfresco.protocol=http + +# Alfresco Share Webapp (share.war) context, ports etc +share.context=share +share.host=localhost +share.port=8080 +share.protocol=http + +# Use Solr4 as that is used by default with Alfresco 5 +index.subsystem.name=solr4 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 + +# 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 +solr.backup.alfresco.remoteBackupLocation=${dir.root}/solr4Backup/alfresco +solr.backup.archive.remoteBackupLocation=${dir.root}/solr4Backup/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 +# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable 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 @@ -51,251 +63,16 @@ 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) - +# Database connection properties db.driver=${alfresco.db.datasource.class} 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 +hibernate.dialect=org.hibernate.dialect.H2Dialect # File servers related properties -# For local builds we disable CIFS and FTP. Edit the following property to reenable them +# For local runs we disable CIFS and FTP cifs.enabled=false - -ftp.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 - +ftp.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 3e55d0c1..7b17ad14 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -15,6 +15,14 @@ run + + + + ${project.parent.basedir}/${alfresco.data.location}/solr4 + ${alfresco.solr.dir}/config + + @@ -39,6 +47,11 @@ + + org.apache.tomcat.maven tomcat7-maven-plugin @@ -53,26 +66,25 @@ true + true / - ${project.parent.basedir}/solr/solr_home + ${alfresco.solr.home.dir} + + false - - ${project.groupId} - solr - ${project.version} - war - true - /solr - ${project.build.directory}/contexts/context-solr.xml - ${project.groupId} repo ${project.version} war + true /alfresco ${project.build.directory}/contexts/context-repo.xml @@ -86,12 +98,22 @@ /share ${project.build.directory}/contexts/context-share.xml + + ${alfresco.groupId} + alfresco-solr4 + ${alfresco.version} + war + true + /solr4 + ${alfresco.solr.home.dir}/context.xml + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/src/main/webapp/index.html b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/src/main/webapp/index.html index af304a08..2ba3c400 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/src/main/webapp/index.html +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/src/main/webapp/index.html @@ -10,7 +10,7 @@

Resources: