exo-jcr SVN: r4940 - kernel/tags.
by do-not-reply＠jboss.org
Author: quangexoplatform
Date: 2011-09-23 02:35:03 -0400 (Fri, 23 Sep 2011)
New Revision: 4940
Added:
kernel/tags/2.2.10-GA/
Log:
[maven-release-plugin] [PLF-1660] copy for tag 2.2.10-GA
12 years, 9 months
exo-jcr SVN: r4939 - in kernel/branches/2.2.x: exo.kernel.commons and 12 other directories.
by do-not-reply＠jboss.org
Author: quangexoplatform
Date: 2011-09-23 02:34:35 -0400 (Fri, 23 Sep 2011)
New Revision: 4939
Modified:
kernel/branches/2.2.x/exo.kernel.commons/pom.xml
kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
kernel/branches/2.2.x/exo.kernel.container/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
kernel/branches/2.2.x/packaging/module/pom.xml
kernel/branches/2.2.x/pom.xml
Log:
[maven-release-plugin] [PLF-1660]prepare release 2.2.10-GA
Modified: kernel/branches/2.2.x/exo.kernel.commons/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.commons/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.component.cache/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.component.command/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.component.common/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.component.remote/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.component.remote</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.container/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.container/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/exo.kernel.mc-integration/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/branches/2.2.x/packaging/module/pom.xml
===================================================================
--- kernel/branches/2.2.x/packaging/module/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/packaging/module/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: kernel/branches/2.2.x/pom.xml
===================================================================
--- kernel/branches/2.2.x/pom.xml 2011-09-22 13:33:13 UTC (rev 4938)
+++ kernel/branches/2.2.x/pom.xml 2011-09-23 06:34:35 UTC (rev 4939)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.2.10-GA-SNAPSHOT</version>
+ <version>2.2.10-GA</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/branches/2.2.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/branches/2.2.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/2.2.10-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/2.2.10-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/2.2.10-GA</url>
</scm>
<modules>
12 years, 9 months
exo-jcr SVN: r4938 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-09-22 09:33:13 -0400 (Thu, 22 Sep 2011)
New Revision: 4938
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
Log:
EXOJCR-1493 : Fix asynch JMX reindexing for System Search Manager.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-09-22 09:01:22 UTC (rev 4937)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-09-22 13:33:13 UTC (rev 4938)
@@ -521,7 +521,7 @@
if (itemStates.getSize() > 0)
{
//Check if SearchManager started and filter configured
- if (changesFilter != null)
+ if (changesFilter != null && parentSearchManager!=null)
{
changesFilter.onSaveItems(itemStates);
}
@@ -951,6 +951,7 @@
if (parentSearchManager != null)
{
changesFilter = initializeChangesFilter();
+ parentSearchManager.setChangesFilter(changesFilter);
}
}
catch (SecurityException e)
@@ -984,6 +985,20 @@
}
/**
+ * Inserts the instance of {@link IndexerChangesFilter} into the {@link SearchManager}.
+ * Used to set instance for {@link SystemSearchManager}.
+ *
+ * @param changesFilter
+ */
+ protected void setChangesFilter(IndexerChangesFilter changesFilter)
+ {
+ if (this.changesFilter == null)
+ {
+ this.changesFilter = changesFilter;
+ }
+ }
+
+ /**
* @param query
* @return
* @throws RepositoryException
@@ -1598,7 +1613,7 @@
{
try
{
- File backupDir = new File((File) context.getObject(DataRestoreContext.STORAGE_DIR), getStorageName());
+ File backupDir = new File((File)context.getObject(DataRestoreContext.STORAGE_DIR), getStorageName());
if (!PrivilegedFileHelper.exists(backupDir))
{
12 years, 9 months
exo-jcr SVN: r4937 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query: lucene and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-09-22 05:01:22 -0400 (Thu, 22 Sep 2011)
New Revision: 4937
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-1493 : Improve logger output, to be more informative and human read. Added WS path and name to some index logs.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java 2011-09-21 16:04:21 UTC (rev 4936)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java 2011-09-22 09:01:22 UTC (rev 4937)
@@ -93,6 +93,8 @@
private final String repositoryName;
+ private final String workspaceName;
+
/**
* Creates a new context instance.
*
@@ -124,7 +126,7 @@
NodeTypeDataManager nodeTypeDataManager, NamespaceRegistryImpl nsRegistry, QueryHandler parentHandler,
String indexDirectory, DocumentReaderService extractor, boolean createInitialIndex,
boolean useIndexRecoveryFilters, LuceneVirtualTableResolver virtualTableResolver, IndexRecovery indexRecovery,
- RPCService rpcService, String repositoryName)
+ RPCService rpcService, String repositoryName, String workspaceName)
{
this.indexRecovery = indexRecovery;
this.container = container;
@@ -140,6 +142,7 @@
this.rpcService = rpcService;
this.parentHandler = parentHandler;
this.repositoryName = repositoryName;
+ this.workspaceName = workspaceName;
this.recoveryFilterUsed = useIndexRecoveryFilters;
((NodeTypeDataManagerImpl)this.nodeTypeDataManager).addListener(propRegistry);
}
@@ -278,4 +281,23 @@
return repositoryName;
}
+ /**
+ * @return
+ * The name of current workspace
+ */
+ public String getWorkspaceName()
+ {
+ return workspaceName;
+ }
+
+ /**
+ * @return
+ * The full path of workspace including information if current QueryHandler is a System one.
+ * I.e. "repository/production[system]"
+ */
+ public String getWorkspacePath(boolean includeSystemMark)
+ {
+ return repositoryName + "/" + workspaceName + ((includeSystemMark && parentHandler == null) ? "[system]" : "");
+ }
+
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-09-21 16:04:21 UTC (rev 4936)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-09-22 09:01:22 UTC (rev 4937)
@@ -779,7 +779,7 @@
QueryHandlerContext context =
new QueryHandlerContext(container, itemMgr, indexingTree, nodeTypeDataManager, nsReg, parentHandler,
PrivilegedFileHelper.getAbsolutePath(getIndexDirectory()), extractor, true, recoveryFilterUsed,
- virtualTableResolver, indexRecovery, rpcService, repositoryName);
+ virtualTableResolver, indexRecovery, rpcService, repositoryName, wsId);
return context;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-09-21 16:04:21 UTC (rev 4936)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-09-22 09:01:22 UTC (rev 4937)
@@ -437,7 +437,7 @@
if (doForceReindexing && !indexes.isEmpty())
{
- log.info("Removing stale indexes.");
+ log.info("Removing stale indexes (" + handler.getContext().getWorkspacePath(true) + ").");
List<PersistentIndex> oldIndexes = new ArrayList<PersistentIndex>(indexes);
for (PersistentIndex persistentIndex : oldIndexes)
@@ -458,7 +458,7 @@
&& handler.getContext().getIndexRecovery() != null && handler.getContext().getRPCService() != null
&& handler.getContext().getRPCService().isCoordinator() == false)
{
- log.info("Retrieving index from coordinator...");
+ log.info("Retrieving index from coordinator (" + handler.getContext().getWorkspacePath(true) + ")...");
indexCreated = recoveryIndexFromCoordinator();
if (indexCreated)
@@ -512,14 +512,15 @@
}
executeAndLog(new Commit(getTransactionId()));
- log.info("Created initial index for {} nodes", new Long(count));
+ log.info("Initial index for {} nodes created ({}).", new Long(count), handler.getContext()
+ .getWorkspacePath(true));
releaseMultiReader();
scheduleFlushTask();
}
}
catch (Exception e)
{
- String msg = "Error indexing workspace";
+ String msg = "Error indexing workspace.";
IOException ex = new IOException(msg);
ex.initCause(e);
throw ex;
@@ -531,7 +532,7 @@
}
else
{
- throw new IllegalStateException("Index already present");
+ throw new IllegalStateException("Index already present.");
}
}
@@ -3385,7 +3386,7 @@
// switching to ONLINE
if (isOnline)
{
- log.info("Setting index back online");
+ log.info("Setting index ONLINE ({})", handler.getContext().getWorkspacePath(true));
if (modeHandler.getMode() == IndexerIoMode.READ_WRITE)
{
offlineIndex.commit(true);
@@ -3410,7 +3411,7 @@
// switching to OFFLINE
else
{
- log.info("Setting index offline");
+ log.info("Setting index OFFLINE ({})", handler.getContext().getWorkspacePath(true));
merger.dispose();
offlineIndex =
new OfflinePersistentIndex(handler.getTextAnalyzer(), handler.getSimilarity(), cache, indexingQueue,
12 years, 9 months
exo-jcr SVN: r4936 - jcr/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-09-21 12:04:21 -0400 (Wed, 21 Sep 2011)
New Revision: 4936
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-1547: Upgrade ISPN to 5.0.1 FINAL (jcr)
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2011-09-21 16:03:29 UTC (rev 4935)
+++ jcr/trunk/pom.xml 2011-09-21 16:04:21 UTC (rev 4936)
@@ -387,12 +387,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.0.0.FINAL</version>
+ <version>5.0.1.FINAL</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>5.0.0.FINAL</version>
+ <version>5.0.1.FINAL</version>
</dependency>
</dependencies>
</dependencyManagement>
12 years, 9 months
exo-jcr SVN: r4935 - kernel/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-09-21 12:03:29 -0400 (Wed, 21 Sep 2011)
New Revision: 4935
Modified:
kernel/trunk/pom.xml
Log:
EXOJCR-1547: Upgrade ISPN to 5.0.1 FINAL (kernel)
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-09-21 14:53:08 UTC (rev 4934)
+++ kernel/trunk/pom.xml 2011-09-21 16:03:29 UTC (rev 4935)
@@ -212,7 +212,7 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.0.0.FINAL</version>
+ <version>5.0.1.FINAL</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
12 years, 9 months
exo-jcr SVN: r4934 - in kernel/trunk: exo.kernel.component.common and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2011-09-21 10:53:08 -0400 (Wed, 21 Sep 2011)
New Revision: 4934
Modified:
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js
kernel/trunk/pom.xml
Log:
EXOJCR-1546: Downgrade Quartz to prevent incompatibility issues with EAP
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-21 12:53:33 UTC (rev 4933)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-09-21 14:53:08 UTC (rev 4934)
@@ -82,7 +82,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
+ <groupId>quartz</groupId>
<artifactId>quartz</artifactId>
</dependency>
<dependency>
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2011-09-21 14:53:08 UTC (rev 4934)
@@ -264,7 +264,8 @@
public boolean removeGlobalJobListener(String name) throws Exception
{
- return scheduler_.removeGlobalJobListener(name);
+ JobListener jlistener = getGlobalJobListener(name);
+ return scheduler_.removeGlobalJobListener(jlistener);
}
public void addJobListener(ComponentPlugin plugin) throws Exception
@@ -323,7 +324,8 @@
public boolean removeGlobaTriggerListener(String name) throws Exception
{
- return scheduler_.removeGlobalTriggerListener(name);
+ TriggerListener tlistener = getGlobalTriggerListener(name);
+ return scheduler_.removeGlobalTriggerListener(tlistener);
}
public void addTriggerListener(ComponentPlugin plugin) throws Exception
Modified: kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js
===================================================================
--- kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-09-21 12:53:33 UTC (rev 4933)
+++ kernel/trunk/packaging/module/src/main/javascript/kernel.packaging.module.js 2011-09-21 14:53:08 UTC (rev 4934)
@@ -38,7 +38,7 @@
module.component.common =
new Project("org.exoplatform.kernel", "exo.kernel.component.common", "jar", module.version).
addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")).
- addDependency(new Project("org.quartz-scheduler", "quartz", "jar", "1.8.4")).
+ addDependency(new Project("quartz", "quartz", "jar", "1.5.2")).
addDependency(new Project("javax.activation", "activation", "jar", "1.1")).
addDependency(new Project("javax.mail", "mail", "jar", "1.4.4"));
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-09-21 12:53:33 UTC (rev 4933)
+++ kernel/trunk/pom.xml 2011-09-21 14:53:08 UTC (rev 4934)
@@ -158,9 +158,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.quartz-scheduler</groupId>
+ <groupId>quartz</groupId>
<artifactId>quartz</artifactId>
- <version>1.8.4</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
12 years, 9 months
exo-jcr SVN: r4933 - in core/trunk: exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-09-21 08:53:33 -0400 (Wed, 21 Sep 2011)
New Revision: 4933
Added:
core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java
Removed:
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java
Modified:
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
Log:
JCR-1670: Add caching to JCR Organization service
Added: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java
===================================================================
--- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java (rev 0)
+++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/CacheHandler.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.services.organization;
+
+import org.exoplatform.services.cache.CacheService;
+import org.exoplatform.services.cache.ExoCache;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="abazko(a)exoplatform.com">Anatoliy Bazko</a>
+ * @version $Id: CacheHandler.java 34360 2009-07-22 23:58:59Z tolusha $
+ */
+public class CacheHandler
+{
+ public static final String MEMBERSHIPTYPE_PREFIX = "mt=";
+
+ public static final String GROUP_PREFIX = "g=";
+
+ public static final String USER_PREFIX = "u=";
+
+ /**
+ * Cache for Users.
+ */
+ protected final ExoCache<Serializable, User> userCache;
+
+ /**
+ * Cache for Users profiles.
+ */
+ protected final ExoCache<Serializable, UserProfile> userProfileCache;
+
+ /**
+ * Cache for MembershipTypes.
+ */
+ protected final ExoCache<Serializable, MembershipType> membershipTypeCache;
+
+ /**
+ * Cache for Memberships.
+ */
+ protected final ExoCache<Serializable, Membership> membershipCache;
+
+ /**
+ * Cache for Groups.
+ */
+ protected final ExoCache<Serializable, Group> groupCache;
+
+ /**
+ * Constructor CacheHandler.
+ *
+ * @param cservice
+ * The cache handler
+ */
+ public CacheHandler(CacheService cservice)
+ {
+ this.userCache = cservice.getCacheInstance(this.getClass().getName() + "userCache");
+ this.userProfileCache = cservice.getCacheInstance(this.getClass().getName() + "userProfileCache");
+ this.membershipTypeCache = cservice.getCacheInstance(this.getClass().getName() + "membershipTypeCache");
+ this.groupCache = cservice.getCacheInstance(this.getClass().getName() + "groupCache");
+ this.membershipCache = cservice.getCacheInstance(this.getClass().getName() + "membershipCache");
+ }
+
+ public void put(Serializable key, Object value, CacheType cacheType)
+ {
+ if (cacheType == CacheType.USER)
+ {
+ userCache.put(key, (User)value);
+ }
+ else if (cacheType == CacheType.GROUP)
+ {
+ groupCache.put(key, (Group)value);
+ }
+ else if (cacheType == CacheType.MEMBERSHIP)
+ {
+ membershipCache.put(key, (Membership)value);
+ }
+ else if (cacheType == CacheType.MEMBERSHIPTYPE)
+ {
+ membershipTypeCache.put(key, (MembershipType)value);
+ }
+ else if (cacheType == CacheType.USER_PROFILE)
+ {
+ userProfileCache.put(key, (UserProfile)value);
+ }
+ }
+
+ public Object get(Serializable key, CacheType cacheType)
+ {
+ Object obj = null;
+ if (cacheType == CacheType.USER)
+ {
+ obj = userCache.get(key);
+ }
+ else if (cacheType == CacheType.GROUP)
+ {
+ obj = groupCache.get(key);
+ }
+ else if (cacheType == CacheType.MEMBERSHIP)
+ {
+ obj = membershipCache.get(key);
+ }
+ else if (cacheType == CacheType.MEMBERSHIPTYPE)
+ {
+ obj = membershipTypeCache.get(key);
+ }
+ else if (cacheType == CacheType.USER_PROFILE)
+ {
+ obj = userProfileCache.get(key);
+ }
+
+ if (obj != null && obj instanceof Cloneable)
+ {
+ try
+ {
+ // need to return the clone of the object since object is mutable
+ return obj.getClass().getMethod("clone").invoke(obj);
+ }
+ catch (Exception e)
+ {
+ return obj;
+ }
+ }
+ return obj;
+ }
+
+ public void remove(Serializable key, CacheType cacheType)
+ {
+ if (cacheType == CacheType.USER)
+ {
+ userCache.remove(key);
+ }
+ else if (cacheType == CacheType.GROUP)
+ {
+ groupCache.remove(key);
+ }
+ else if (cacheType == CacheType.MEMBERSHIP)
+ {
+ try
+ {
+ for (Membership m : membershipCache.getCachedObjects())
+ {
+ String mkey = getMembershipKey(m);
+ if (mkey.indexOf((String)key) >= 0)
+ {
+ membershipCache.remove(mkey);
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ }
+ }
+ else if (cacheType == CacheType.MEMBERSHIPTYPE)
+ {
+ membershipTypeCache.remove(key);
+ }
+ else if (cacheType == CacheType.USER_PROFILE)
+ {
+ userProfileCache.remove(key);
+ }
+ }
+
+ public void move(Serializable oldKey, Serializable newKey, CacheType cacheType)
+ {
+ if (cacheType == CacheType.USER)
+ {
+ userCache.put(newKey, userCache.remove(oldKey));
+ }
+ else if (cacheType == CacheType.GROUP)
+ {
+ groupCache.put(newKey, groupCache.remove(oldKey));
+ }
+ else if (cacheType == CacheType.MEMBERSHIP)
+ {
+ try
+ {
+ Map<Serializable, Membership> wait4Adding = new HashMap<Serializable, Membership>();
+
+ for (Membership m : membershipCache.getCachedObjects())
+ {
+ String mkey = getMembershipKey(m);
+ if (mkey.indexOf((String)oldKey) >= 0)
+ {
+ wait4Adding.put(mkey.replace((String)oldKey, (String)newKey), membershipCache.remove(mkey));
+ }
+ }
+
+ membershipCache.putMap(wait4Adding);
+ }
+ catch (Exception e)
+ {
+ }
+ }
+ else if (cacheType == CacheType.MEMBERSHIPTYPE)
+ {
+ membershipTypeCache.put(newKey, membershipTypeCache.remove(oldKey));
+ }
+ else if (cacheType == CacheType.USER_PROFILE)
+ {
+ userProfileCache.put(newKey, userProfileCache.remove(oldKey));
+ }
+ }
+
+ public String getMembershipKey(Membership m)
+ {
+ StringBuilder key = new StringBuilder();
+ key.append(GROUP_PREFIX + m.getGroupId());
+ key.append(MEMBERSHIPTYPE_PREFIX + m.getMembershipType());
+ key.append(USER_PREFIX + m.getUserName());
+
+ return key.toString();
+ }
+
+ public String getMembershipKey(String username, String groupId, String type)
+ {
+ StringBuilder key = new StringBuilder();
+ key.append(GROUP_PREFIX + groupId);
+ key.append(MEMBERSHIPTYPE_PREFIX + type);
+ key.append(USER_PREFIX + username);
+
+ return key.toString();
+ }
+
+ public static enum CacheType
+ {
+ USER, GROUP, MEMBERSHIP, MEMBERSHIPTYPE, USER_PROFILE
+ }
+}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADGroupDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -19,6 +19,7 @@
package org.exoplatform.services.organization.ldap;
import org.exoplatform.services.ldap.LDAPService;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Group;
import java.util.ArrayList;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADMembershipDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -19,11 +19,12 @@
package org.exoplatform.services.organization.ldap;
import org.exoplatform.services.ldap.LDAPService;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.Membership;
import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.MembershipImpl;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Collection;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/ADUserDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -19,8 +19,9 @@
package org.exoplatform.services.organization.ldap;
import org.exoplatform.services.ldap.LDAPService;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.User;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import javax.naming.Context;
import javax.naming.NamingException;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -21,10 +21,11 @@
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.GroupImpl;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Enumeration;
Deleted: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/CacheHandler.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2011 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.services.organization.ldap;
-
-import org.exoplatform.services.cache.CacheService;
-import org.exoplatform.services.cache.ExoCache;
-import org.exoplatform.services.organization.Group;
-import org.exoplatform.services.organization.Membership;
-import org.exoplatform.services.organization.MembershipType;
-import org.exoplatform.services.organization.User;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="abazko(a)exoplatform.com">Anatoliy Bazko</a>
- * @version $Id: CacheHandler.java 34360 2009-07-22 23:58:59Z tolusha $
- */
-public class CacheHandler
-{
- public static final String MEMBERSHIPTYPE_PREFIX = "mt=";
-
- public static final String GROUP_PREFIX = "g=";
-
- public static final String USER_PREFIX = "u=";
-
- /**
- * Cache for Users.
- */
- private final ExoCache<Serializable, User> userCache;
-
- /**
- * Cache for MembershipTypes.
- */
- private final ExoCache<Serializable, MembershipType> membershipTypeCache;
-
- /**
- * Cache for Memberships.
- */
- private final ExoCache<Serializable, Membership> membershipCache;
-
- /**
- * Cache for Groups.
- */
- private final ExoCache<Serializable, Group> groupCache;
-
- /**
- * Constructor CacheHandler.
- *
- * @param cservice
- * The cache handler
- */
- public CacheHandler(CacheService cservice)
- {
- this.userCache = cservice.getCacheInstance(this.getClass().getName() + "userCache");
- this.membershipTypeCache = cservice.getCacheInstance(this.getClass().getName() + "membershipTypeCache");
- this.groupCache = cservice.getCacheInstance(this.getClass().getName() + "groupCache");
- this.membershipCache = cservice.getCacheInstance(this.getClass().getName() + "membershipCache");
- }
-
- public void put(Serializable key, Object value, CacheType cacheType)
- {
- if (cacheType == CacheType.USER)
- {
- userCache.put(key, (User)value);
- }
- else if (cacheType == CacheType.GROUP)
- {
- groupCache.put(key, (Group)value);
- }
- else if (cacheType == CacheType.MEMBERSHIP)
- {
- membershipCache.put(key, (Membership)value);
- }
- else if (cacheType == CacheType.MEMBERSHIPTYPE)
- {
- membershipTypeCache.put(key, (MembershipType)value);
- }
- }
-
- public Object get(Serializable key, CacheType cacheType)
- {
- if (cacheType == CacheType.USER)
- {
- return userCache.get(key);
- }
- else if (cacheType == CacheType.GROUP)
- {
- return groupCache.get(key);
- }
- else if (cacheType == CacheType.MEMBERSHIP)
- {
- return membershipCache.get(key);
- }
- else if (cacheType == CacheType.MEMBERSHIPTYPE)
- {
- return membershipTypeCache.get(key);
- }
-
- return null;
- }
-
- public void remove(Serializable key, CacheType cacheType)
- {
- if (cacheType == CacheType.USER)
- {
- userCache.remove(key);
- }
- else if (cacheType == CacheType.GROUP)
- {
- groupCache.remove(key);
- }
- else if (cacheType == CacheType.MEMBERSHIP)
- {
- try
- {
- String tKey = ((String)key).toUpperCase();
- for (Membership m : membershipCache.getCachedObjects())
- {
- String mkey = getMembershipKey(m);
- if (mkey.toUpperCase().indexOf(tKey) >= 0)
- {
- membershipCache.remove(mkey);
- }
- }
- }
- catch (Exception e)
- {
- }
- }
- else if (cacheType == CacheType.MEMBERSHIPTYPE)
- {
- membershipTypeCache.remove(key);
- }
- }
-
- public String getMembershipKey(Membership m)
- {
- StringBuilder key = new StringBuilder();
- key.append(GROUP_PREFIX + m.getGroupId());
- key.append(MEMBERSHIPTYPE_PREFIX + m.getMembershipType());
- key.append(USER_PREFIX + m.getUserName());
-
- return key.toString();
- }
-
- public String getMembershipKey(String username, String groupId, String type)
- {
- StringBuilder key = new StringBuilder();
- key.append(GROUP_PREFIX + groupId);
- key.append(MEMBERSHIPTYPE_PREFIX + type);
- key.append(USER_PREFIX + username);
-
- return key.toString();
- }
-
- static enum CacheType
- {
- USER, GROUP, MEMBERSHIP, MEMBERSHIPTYPE
- }
-}
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/GroupDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -21,12 +21,13 @@
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.GroupEventListener;
import org.exoplatform.services.organization.GroupEventListenerHandler;
import org.exoplatform.services.organization.GroupHandler;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.GroupImpl;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Collection;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -22,6 +22,7 @@
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.Membership;
import org.exoplatform.services.organization.MembershipEventListener;
@@ -30,9 +31,9 @@
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.MembershipImpl;
import org.exoplatform.services.organization.impl.mock.SimpleMembershipListAccess;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Collection;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipTypeDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -21,12 +21,13 @@
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.MembershipType;
import org.exoplatform.services.organization.MembershipTypeEventListener;
import org.exoplatform.services.organization.MembershipTypeEventListenerHandler;
import org.exoplatform.services.organization.MembershipTypeHandler;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.MembershipTypeImpl;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Collection;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/OrganizationServiceImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -24,6 +24,7 @@
import org.exoplatform.services.database.HibernateService;
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.organization.BaseOrganizationService;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.hibernate.UserProfileDAOImpl;
/**
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -21,13 +21,14 @@
import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.services.ldap.LDAPService;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.Query;
import org.exoplatform.services.organization.User;
import org.exoplatform.services.organization.UserEventListener;
import org.exoplatform.services.organization.UserEventListenerHandler;
import org.exoplatform.services.organization.UserHandler;
+import org.exoplatform.services.organization.CacheHandler.CacheType;
import org.exoplatform.services.organization.impl.UserImpl;
-import org.exoplatform.services.organization.ldap.CacheHandler.CacheType;
import java.util.ArrayList;
import java.util.Collections;
Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java
===================================================================
--- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
+++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserProfileDAOImpl.java 2011-09-21 12:53:33 UTC (rev 4933)
@@ -21,6 +21,7 @@
import org.exoplatform.services.ldap.LDAPService;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.exoplatform.services.organization.CacheHandler;
import org.exoplatform.services.organization.UserProfile;
import org.exoplatform.services.organization.UserProfileEventListener;
import org.exoplatform.services.organization.UserProfileEventListenerHandler;
12 years, 9 months
exo-jcr SVN: r4932 - in jcr/trunk/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/impl/core/nodetype and 1 other directory.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-09-20 10:43:26 -0400 (Tue, 20 Sep 2011)
New Revision: 4932
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/AbstractNodeTypeRepository.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/nodetype/TestNodeTypeRegistration.java
Log:
EXOJCR-1516: fixed unregistration of node type, now it is also removed from persister
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/AbstractNodeTypeRepository.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/AbstractNodeTypeRepository.java 2011-09-20 10:52:45 UTC (rev 4931)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/AbstractNodeTypeRepository.java 2011-09-20 14:43:26 UTC (rev 4932)
@@ -155,6 +155,15 @@
}
/**
+ * {@inheritDoc}
+ */
+ public void unregisterNodeType(NodeTypeData nodeType) throws RepositoryException
+ {
+ nodeTypeDataPersister.removeNodeType(nodeType);
+ removeNodeType(nodeType);
+ }
+
+ /**
* @see org.picocontainer.Startable#start()
*/
public void start()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-09-20 10:52:45 UTC (rev 4931)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeDataManagerImpl.java 2011-09-20 14:43:26 UTC (rev 4932)
@@ -884,7 +884,7 @@
throw new RepositoryException(message);
}
- this.nodeTypeRepository.removeNodeType(nodeType);
+ this.nodeTypeRepository.unregisterNodeType(nodeType);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java 2011-09-20 10:52:45 UTC (rev 4931)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeRepository.java 2011-09-20 14:43:26 UTC (rev 4932)
@@ -124,6 +124,13 @@
void removeNodeType(NodeTypeData nodeType);
/**
+ * @param nodeTypeName
+ * @param nodeType
+ * @exception RepositoryException
+ */
+ void unregisterNodeType(NodeTypeData nodeType) throws RepositoryException;
+
+ /**
* Write node types to stream
*
* @param os output stream
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/nodetype/TestNodeTypeRegistration.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/nodetype/TestNodeTypeRegistration.java 2011-09-20 10:52:45 UTC (rev 4931)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/nodetype/TestNodeTypeRegistration.java 2011-09-20 14:43:26 UTC (rev 4932)
@@ -23,6 +23,10 @@
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeValue;
import org.exoplatform.services.jcr.core.nodetype.PropertyDefinitionValue;
+import org.exoplatform.services.jcr.dataflow.DataManager;
+import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.impl.core.nodetype.registration.JCRNodeTypeDataPersister;
+import org.exoplatform.services.jcr.impl.core.nodetype.registration.NodeTypeDataPersister;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -38,6 +42,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.ValueFormatException;
import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
/**
* Created by The eXo Platform SAS.
@@ -1490,4 +1495,44 @@
l1.addNode("l3", "myNodeTypes");
session.save();
}
+
+ public void testNodeTypePersistedUnregistration() throws Exception
+ {
+ NodeTypeValue testNtv = new NodeTypeValue();
+ testNtv.setName("testingNodeType");
+
+ List<NodeTypeValue> list = new ArrayList<NodeTypeValue>();
+ list.add(testNtv);
+
+ InternalQName testingNodeTypeName = new InternalQName("", "testingNodeType");
+
+ NodeTypeDataPersister nodeTypeDataPersister =
+ new JCRNodeTypeDataPersister((DataManager)session.getTransientNodesManager().getTransactManager(), true);
+ nodeTypeDataPersister.start();
+
+
+ nodeTypeManager.registerNodeTypes(list, ExtendedNodeTypeManager.FAIL_IF_EXISTS);
+ assertNotNull(nodeTypeDataPersister.getNodeType(testingNodeTypeName));
+ assertNotNull(nodeTypeManager.getNodeType("testingNodeType"));
+
+ nodeTypeManager.unregisterNodeType("testingNodeType");
+ try
+ {
+ nodeTypeManager.getNodeType("testingNodeType");
+ fail();
+ }
+ catch (NoSuchNodeTypeException e)
+ {
+ // ok
+ }
+ try
+ {
+ nodeTypeDataPersister.getNodeType(testingNodeTypeName);
+ fail();
+ }
+ catch (RepositoryException e)
+ {
+ // ok
+ }
+ }
}
12 years, 9 months
exo-jcr SVN: r4931 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-09-20 06:52:45 -0400 (Tue, 20 Sep 2011)
New Revision: 4931
Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
Log:
EXOJCR-1441: fix tests
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2011-09-20 10:25:43 UTC (rev 4930)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2011-09-20 10:52:45 UTC (rev 4931)
@@ -176,7 +176,7 @@
(WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
WorkspaceEntry wsConfig = new WorkspaceEntry();
- wsConfig.setName("testConfigWorkspaceSuccess");
+ wsConfig.setName("testCWS");
wsConfig.setAccessManager(defConfig.getAccessManager());
wsConfig.setCache(defConfig.getCache());
@@ -207,8 +207,8 @@
public Object run() throws Exception
{
// remove configured workspace
- repository.createWorkspace("testConfigWorkspaceSuccess");
- repository.internalRemoveWorkspace("testConfigWorkspaceSuccess");
+ repository.createWorkspace("testCWS");
+ repository.internalRemoveWorkspace("testCWS");
return null;
}
@@ -273,7 +273,7 @@
(WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
final WorkspaceEntry wsConfig = new WorkspaceEntry();
- wsConfig.setName("testCreateWorkspaceSuccess");
+ wsConfig.setName("testCWS");
wsConfig.setAccessManager(defConfig.getAccessManager());
wsConfig.setCache(defConfig.getCache());
@@ -285,7 +285,7 @@
public Object run() throws Exception
{
repository.configWorkspace(wsConfig);
- repository.createWorkspace("testCreateWorkspaceSuccess");
+ repository.createWorkspace("testCWS");
return null;
}
@@ -308,7 +308,7 @@
public Object run() throws Exception
{
// remove configured workspace
- repository.internalRemoveWorkspace("testCreateWorkspaceSuccess");
+ repository.internalRemoveWorkspace("testCWS");
return null;
}
@@ -363,7 +363,7 @@
(WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class);
final WorkspaceEntry wsConfig = new WorkspaceEntry();
- wsConfig.setName("testInternalRemoveWorkspaceSuccess");
+ wsConfig.setName("testIRWS");
wsConfig.setAccessManager(defConfig.getAccessManager());
wsConfig.setCache(defConfig.getCache());
@@ -376,8 +376,8 @@
public Object run() throws Exception
{
repository.configWorkspace(wsConfig);
- repository.createWorkspace("testInternalRemoveWorkspaceSuccess");
- repository.internalRemoveWorkspace("testInternalRemoveWorkspaceSuccess");
+ repository.createWorkspace("testIRWS");
+ repository.internalRemoveWorkspace("testIRWS");
return null;
}
12 years, 9 months