mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged V4.0-BUG-FIX to HEAD
33935: ALF-12854: SOLR - requires more detailed tracking information
- Part 1: info reported for the SOLR SUMMARY action
33936: ALF-11693: Treat logging.properties the same way as log4j.properties and excluded it from the core .jar
33945: ALF-12867: RIP jmx-dumper.jar
33946: Fix minor issue introduced in r33920
33947: IT-6847 "Error displays on recent 4.0 TS upgrade while navigate to a document details page"
- errors spotted on folder details & in document library list also resolved by this fix
33951: ALF-12867: Fixed typo
33955: Some unit tests and examples on how to implement file wiping or shredding
- One API change: On EagerContentStoreCleaner, the following is now protected:
protected boolean deleteFromStore(String contentUrl, ContentStore store)
- Examples in unit test ContentStoreCleanerTest: testForcedImmediateShredding and testShreddingCleanup
33962: RIP hyperic plugin
33965: ALF-12697: Asynchronously get RSS items for dashlets on page load
33969: Fix for ALF-12307 Solr backup fills the disk
- number to Keep can be set by property/subsystem/Share admin
- set default backup localtion
33970: Fix for ALF-12854 SOLR - requires more detailed tracking information
Part 2: basic stats added to JMX and improved statistical moment calculation
33984: Update 4.0.1 installers to use Tomcat 6.0.35
- Remembered to set useHttpOnly on <Context>
- Also commented out JreMemoryLeakPreventionListener
33988: ALF-12717 CIFS: Unfriendly message occurs when a user with consumer/contributor role tries to rename space.
33997: ALF-12697: Remove async WebScript from dashlet family
33999: Fix for ALF-12854 SOLR - requires more detailed tracking information
- Final part - Expose via share admin
34005: Fix for ALF-12708
34007: Merged V3.4-BUG-FIX (3.4.9) to 3.4-BUG-FIX (4.0.1)
34006: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
34002: ALF-12898: MMT does not calculate the current version number correctly and does not report errors
- ModuleManagementTool was constructing the wrong current war file version number.
The minor and revision values were the wrong way around. 3.4.8 became 3.8.4
- Modified unit test to use the actual version number in the test war 4.1.0 rather than 4.0.1
- Modified the ModuleManagementTool so that problems would be reported to the user even if they did not have -verbose set
34016: Update version.revision for 4.0.1
34022: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
33952: ALF-5680: It is possible to cut/paste a locked file
34003: Merged DEV to V3.4-BUG-FIX
34001: ALF-12709: CLONE - Run action Wizard. Can't run action.
Fixed regression connected with separator of AVM path in .NodeRef. id that has been changed from .;. to .|.
34023: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
33912: ALF-9899: Merged HEAD to V3.4-BUG-FIX (PARTIAL)
31912: Merged DEV to HEAD
31823: TransactionalCache provides REPEATABLE READ
- Values found in shared cache are placed into transactional cache
- Previously, values could keep changing until first write (READ COMMITTED)
but now the first read sets the value until it is changed by the current
transaction
33981: Updated version.revision for 3.4.9
33985: ALF-12364: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33984: Update 3.4.9 installers to use Tomcat 6.0.35
- Remembered to set useHttpOnly on <Context>
- Also commented out JreMemoryLeakPreventionListener
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -47,6 +47,8 @@ public class SolrBackupClient implements InitializingBean
|
||||
private JobLockService jobLockService;
|
||||
|
||||
private String remoteBackupLocation;
|
||||
|
||||
private int numberToKeep;
|
||||
|
||||
private String core;
|
||||
|
||||
@@ -72,6 +74,14 @@ public class SolrBackupClient implements InitializingBean
|
||||
{
|
||||
this.remoteBackupLocation = remoteBackupLocation;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param numberToKeep the numberToKeep to set
|
||||
*/
|
||||
public void setNumberToKeep(int numberToKeep)
|
||||
{
|
||||
this.numberToKeep = numberToKeep;
|
||||
}
|
||||
|
||||
public void execute()
|
||||
{
|
||||
@@ -132,6 +142,7 @@ public class SolrBackupClient implements InitializingBean
|
||||
params.set("qt", "/"+core+"/replication");
|
||||
params.set("command", "backup");
|
||||
params.set("location", remoteBackupLocation);
|
||||
params.set("numberToKeep", numberToKeep);
|
||||
|
||||
QueryResponse response = solrAdminClient.query(params);
|
||||
|
||||
|
||||
@@ -43,21 +43,47 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
private static String ALFRESCO_LAG = "tracker.alfresco.lag";
|
||||
|
||||
private static String ALFRESCO_LAG_DURATION = "tracker.alfresco.lag.duration";
|
||||
|
||||
private static String ALFRESCO_LAST_INDEXED_TXN = "tracker.alfresco.last.indexed.txn";
|
||||
|
||||
private static String ALFRESCO_APPROX_TXNS_REMAINING = "tracker.alfresco.approx.txns.remaining";
|
||||
|
||||
private static String ALFRESCO_APPROX_INDEXING_TIME_REMAINING = "tracker.alfresco.approx.indexing.time.remaining";
|
||||
|
||||
private static String ARCHIVE_ACTIVE = "tracker.archive.active";
|
||||
|
||||
private static String ARCHIVE_LAG = "tracker.archive.lag";
|
||||
|
||||
private static String ARCHIVE_LAG_DURATION = "tracker.archive.lag.duration";
|
||||
|
||||
private static String ARCHIVE_LAST_INDEXED_TXN = "tracker.archive.last.indexed.txn";
|
||||
|
||||
private static String ARCHIVE_APPROX_TXNS_REMAINING = "tracker.archive.approx.txns.remaining";
|
||||
|
||||
private static String ARCHIVE_APPROX_INDEXING_TIME_REMAINING = "tracker.archive.approx.indexing.time.remaining";
|
||||
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public boolean isUpdateable(String name)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return super.isUpdateable(name)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE) && !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION) && !name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG) && !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION);
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAST_INDEXED_TXN)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_TXNS_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_INDEXING_TIME_REMAINING)
|
||||
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_TXNS_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_INDEXING_TIME_REMAINING)
|
||||
&& !name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAST_INDEXED_TXN)
|
||||
;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -81,12 +107,18 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
String alfrescoLag = alfresco.getString("Lag");
|
||||
String alfrescoActive = alfresco.getString("Active");
|
||||
String alfrescoDuration = alfresco.getString("Duration");
|
||||
String alfrescoLastIndexedTxn = alfresco.getString("Id for last TX in index");
|
||||
String alfrescoApproxTxnsReminaing = alfresco.getString("Approx transactions remaining");
|
||||
String alfrescoApproxIndexingTimeReminaing = alfresco.getString("Approx indexing time remaining");
|
||||
|
||||
|
||||
JSONObject archive = summary.getJSONObject("archive");
|
||||
String archiveLag = archive.getString("Lag");
|
||||
String archiveActive = archive.getString("Active");
|
||||
String archiveDuration = archive.getString("Duration");
|
||||
String archiveLastIndexedTxn = archive.getString("Id for last TX in index");
|
||||
String archiveApproxTxnsReminaing = archive.getString("Approx transactions remaining");
|
||||
String archiveApproxIndexingTimeReminaing = archive.getString("Approx indexing time remaining");
|
||||
|
||||
if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE))
|
||||
{
|
||||
@@ -100,6 +132,18 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return alfrescoDuration;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAST_INDEXED_TXN))
|
||||
{
|
||||
return alfrescoLastIndexedTxn;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_TXNS_REMAINING))
|
||||
{
|
||||
return alfrescoApproxTxnsReminaing;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_APPROX_INDEXING_TIME_REMAINING))
|
||||
{
|
||||
return alfrescoApproxIndexingTimeReminaing;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE))
|
||||
{
|
||||
return archiveActive;
|
||||
@@ -112,6 +156,18 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
{
|
||||
return archiveDuration;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAST_INDEXED_TXN))
|
||||
{
|
||||
return archiveLastIndexedTxn;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_TXNS_REMAINING))
|
||||
{
|
||||
return archiveApproxTxnsReminaing;
|
||||
}
|
||||
else if (name.equals(SolrChildApplicationContextFactory.ARCHIVE_APPROX_INDEXING_TIME_REMAINING))
|
||||
{
|
||||
return archiveApproxIndexingTimeReminaing;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "Unavailable";
|
||||
@@ -139,9 +195,16 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_LAG);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_LAST_INDEXED_TXN);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_APPROX_TXNS_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ALFRESCO_APPROX_INDEXING_TIME_REMAINING);
|
||||
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_LAG);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_LAST_INDEXED_TXN);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_APPROX_TXNS_REMAINING);
|
||||
result.add(SolrChildApplicationContextFactory.ARCHIVE_APPROX_INDEXING_TIME_REMAINING);
|
||||
result.addAll(super.getPropertyNames());
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user