Commit f01290d2e5d1379ae759954692d4ead731d145b5

Authored by Rui Fernandes
1 parent d9ff33e979
Exists in master

review for compatibility with Alfresco Enterprise 2

... ... @@ -24,7 +24,7 @@
24 24 <!-- Defines the alfresco edition to compile against. Allowed values are [org.alfresco|org.alfresco.enterprise]-->
25 25 <alfresco.groupId>org.alfresco</alfresco.groupId>
26 26 <!-- Defines the alfresco version to compile against -->
27   - <alfresco.version>4.2.d</alfresco.version>
  27 + <alfresco.version>4.2.0</alfresco.version>
28 28 <app.log.root.level>WARN</app.log.root.level>
29 29 <alfresco.data.location>alf_data_dev</alfresco.data.location>
30 30 <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
... ... @@ -34,7 +34,7 @@
34 34 . | Could be org.alfresco | org.alfresco.enterprise or your corporate groupId -->
35 35 <alfresco.client.war.groupId>org.alfresco</alfresco.client.war.groupId>
36 36 <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
37   - <alfresco.client.war.version>4.2.e</alfresco.client.war.version>
  37 + <alfresco.client.war.version>4.2.0</alfresco.client.war.version>
38 38 <!-- This controls which properties will be picked in src/test/properties for embedded run -->
39 39 <env>local</env>
40 40 </properties>
... ... @@ -82,6 +82,8 @@
82 82 if you are a Enterprise customer or Partner
83 83 -->
84 84 <repositories>
  85 + <!-- Community Settings -->
  86 + <!--
85 87 <repository>
86 88 <id>alfresco-public</id>
87 89 <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
... ... @@ -89,10 +91,11 @@
89 91 <repository>
90 92 <id>alfresco-public-snapshots</id>
91 93 <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
92   - <snapshots>
93   - <enabled>true</enabled>
94   - <updatePolicy>daily</updatePolicy>
95   - </snapshots>
  94 + </repository>
  95 + -->
  96 + <repository>
  97 + <id>alfresco-private-repository</id>
  98 + <url>https://artifacts.alfresco.com/nexus/content/groups/private</url>
96 99 </repository>
97 100 </repositories>
98 101 </project>
... ...
src/main/java/org/alfresco/schedule/ScheduledJobLockExecuter.java
... ... @@ -24,6 +24,7 @@
24 24 */
25 25 package org.alfresco.schedule;
26 26  
  27 +
27 28 import org.alfresco.repo.lock.JobLockService;
28 29 import org.alfresco.repo.lock.LockAcquisitionException;
29 30 import org.alfresco.service.namespace.NamespaceService;
... ...