Commit 7a33ab32428f1796b7ad1047c61c33d2b4102bf7

Authored by Steven Glover
1 parent 216f38bde8
Exists in master

MNT-16541 "Cache update for custom workflow model fails" fix tests, cleanup pom file

... ... @@ -7,29 +7,13 @@
7 7 <version>2.1-SNAPSHOT</version>
8 8 <name>alfresco-trashcan-cleaner project</name>
9 9 <packaging>jar</packaging>
10   - <description>Manages the lifecycle of the alfresco-trashcan-cleaner (Alfresco Module)</description>
  10 + <description>The Alfresco Trash Can Cleaner (Alfresco Module)</description>
11 11  
12   -<!--
13   - <parent>
14   - <groupId>org.alfresco.maven</groupId>
15   - <artifactId>alfresco-sdk-parent</artifactId>
16   - <version>2.2.0</version>
17   - </parent>
18   - -->
19   - <!--
20   - | SDK properties have sensible defaults in the SDK parent,
21   - | but you can override the properties below to use another version.
22   - | For more available properties see the alfresco-sdk-parent POM.
23   - -->
24 12 <properties>
25 13 <!-- Defines the alfresco edition to compile against. Allowed values are [org.alfresco|org.alfresco.enterprise]-->
26 14 <alfresco.groupId>org.alfresco</alfresco.groupId>
27 15 <!-- Defines the alfresco version to compile against -->
28 16 <alfresco.version>5.2.1-SNAPSHOT</alfresco.version>
29   - <app.log.root.level>WARN</app.log.root.level>
30   - <alfresco.data.location>alf_data_dev</alfresco.data.location>
31   - <!-- This controls which properties will be picked in src/test/properties for embedded run -->
32   - <env>local</env>
33 17  
34 18 <dependency.mysqlconnector.version>5.1.26</dependency.mysqlconnector.version>
35 19 <dependency.postgresqlconnector.version>9.1-901-1.jdbc4</dependency.postgresqlconnector.version>
... ...
src/test/properties/local/alfresco-global.properties
... ... @@ -1,63 +0,0 @@
1   -# Licensed to the Apache Software Foundation (ASF) under one or more
2   -# contributor license agreements. See the NOTICE file distributed with
3   -# this work for additional information regarding copyright ownership.
4   -# The ASF licenses this file to You under the Apache License, Version 2.0
5   -# (the "License"); you may not use this file except in compliance with
6   -# the License. You may obtain a copy of the License at
7   -#
8   -# http://www.apache.org/licenses/LICENSE-2.0
9   -#
10   -# Unless required by applicable law or agreed to in writing, software
11   -# distributed under the License is distributed on an "AS IS" BASIS,
12   -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   -# See the License for the specific language governing permissions and
14   -# limitations under the License.
15   -
16   -
17   -
18   -# RUN TIME PROPERTIES
19   -# -------------------
20   -
21   -# Sample custom content and index data location
22   -# This will create alf_data Relative to appserver run folder
23   -# 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.
24   -dir.root=${alfresco.data.location}
25   -# Allowed values are: NONE, AUTO, FULL
26   -index.recovery.mode=NONE
27   -# As we run embedded, we set Lucene
28   -index.subsystem.name=lucene
29   -
30   -#dir.keystore=.
31   -#keystore.password=storepassword
32   -#metadata.password=metapassword
33   -
34   -# Fail or not when there are node integrity checker errors
35   -integrity.failOnError=true
36   -
37   -# Database connection properties
38   -# These are also filtered from Maven at build time from POM properties.
39   -# Alternatively you can directly define them directly here
40   -db.driver=${alfresco.db.datasource.class}
41   -db.url=${alfresco.db.url}
42   -db.username=${alfresco.db.username}
43   -db.password=${alfresco.db.password}
44   -db.pool.initial=10
45   -db.pool.max=100
46   -
47   -# File servers related properties
48   -# For local builds we disable CIFS and FTP. Edit the following property to reenable them
49   -smb.server.enabled=false
50   -smb.server.name=CFS_SHARE_LOCAL
51   -smb.server.domain=mycompany.com
52   -smb.server.bindto=127.0.0.1
53   -smb.tcpip.port=1445
54   -netbios.session.port=1139
55   -netbios.name.port=1137
56   -netbios.datagram.port=1138
57   -ftp.server.enables=false
58   -ftp.port=1121
59   -ftp.authenticator=alfresco
60   -
61   -trashcan.cron=0 30 * * * ?
62   -trashcan.daysToKeep=1
63   -trashcan.deleteBatchCount=1000
src/test/resources/alfresco-global.properties
... ... @@ -0,0 +1,10 @@
  1 +db.driver=org.postgresql.Driver
  2 +db.url=jdbc:postgresql:${db.name}
  3 +db.password=admin
  4 +db.username=alfresco
  5 +
  6 +trashcan.cron=0 30 * * * ?
  7 +
  8 +trashcan.daysToKeep=P1D
  9 +
  10 +trashcan.deleteBatchCount=1000
... ...