exo-jcr SVN: r5282 - in jcr/trunk/applications/product-patches/as/jonas: bin/unix and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-08 07:32:29 -0500 (Thu, 08 Dec 2011)
New Revision: 5282
Modified:
jcr/trunk/applications/product-patches/as/jonas/apps/autoload/exoplatform.ear/META-INF/application.xml
jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas
Log:
EXOJCR-1042: Jonas deploying problem, fix patch
Modified: jcr/trunk/applications/product-patches/as/jonas/apps/autoload/exoplatform.ear/META-INF/application.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/apps/autoload/exoplatform.ear/META-INF/application.xml 2011-12-08 12:31:48 UTC (rev 5281)
+++ jcr/trunk/applications/product-patches/as/jonas/apps/autoload/exoplatform.ear/META-INF/application.xml 2011-12-08 12:32:29 UTC (rev 5282)
@@ -41,6 +41,6 @@
</web>
</module>
<module>
- <connector>exo-jcr.rar</connector>
+ <connector>exo.jcr.connectors.jca.rar</connector>
</module>
</application>
Modified: jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-12-08 12:31:48 UTC (rev 5281)
+++ jcr/trunk/applications/product-patches/as/jonas/bin/unix/jonas 2011-12-08 12:32:29 UTC (rev 5282)
@@ -79,7 +79,7 @@
# ------------------------- Begin eXo configuration ----------------------------
cd $JONAS_ROOT/bin
-JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=../.."
+JONAS_OPTS="$JONAS_OPTS -Dorg.exoplatform.services.log.Log=org.apache.commons.logging.impl.SimpleLog -Djava.awt.headless=true -Dexo.profiles=$1 -Djava.net.preferIPv4Stack=true -Dexo.jcr.parent.dir=.."
JAVA_OPTS="$JAVA_OPTS -Xmx512M"
if [ "$1" = "jbc" ] || [ "$1" = "ispn" ]; then
shift
12 years, 5 months
exo-jcr SVN: r5281 - jcr/trunk/exo.jcr.connectors.jca/src/main/rar/META-INF.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-08 07:31:48 -0500 (Thu, 08 Dec 2011)
New Revision: 5281
Added:
jcr/trunk/exo.jcr.connectors.jca/src/main/rar/META-INF/jonas-ra.xml
Log:
EXOJCR-1042: Jonas deploying problem, adding jonas-ra.xml to rar
Added: jcr/trunk/exo.jcr.connectors.jca/src/main/rar/META-INF/jonas-ra.xml
===================================================================
--- jcr/trunk/exo.jcr.connectors.jca/src/main/rar/META-INF/jonas-ra.xml (rev 0)
+++ jcr/trunk/exo.jcr.connectors.jca/src/main/rar/META-INF/jonas-ra.xml 2011-12-08 12:31:48 UTC (rev 5281)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 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.
+
+-->
+<jonas-connector xmlns="http://www.objectweb.org/jonas/ns"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.objectweb.org/jonas/ns
+ http://www.objectweb.org/jonas/ns/jonas-connector_4_4.xsd">
+ <jonas-connection-definition>
+ <jndi-name>exojcr</jndi-name>
+ </jonas-connection-definition>
+</jonas-connector>
12 years, 5 months
exo-jcr SVN: r5280 - core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-08 07:25:18 -0500 (Thu, 08 Dec 2011)
New Revision: 5280
Modified:
core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java
Log:
EXOJCR-1679: test updated
Modified: core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java
===================================================================
--- core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java 2011-12-08 12:10:03 UTC (rev 5279)
+++ core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java 2011-12-08 12:25:18 UTC (rev 5280)
@@ -53,6 +53,9 @@
createMembershipType("*", "All membership types");
assertEquals(mtHandler.findMembershipTypes().size(), 4);
+
+ mtHandler.removeMembershipType("*", true);
+ assertEquals(mtHandler.findMembershipTypes().size(), 3);
}
/**
12 years, 5 months
exo-jcr SVN: r5279 - core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-08 07:10:03 -0500 (Thu, 08 Dec 2011)
New Revision: 5279
Modified:
core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java
Log:
EXOJCR-1679: test added
Modified: core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java
===================================================================
--- core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java 2011-12-08 09:11:28 UTC (rev 5278)
+++ core/trunk/exo.core.component.organization.tests/src/main/java/org/exoplatform/services/tck/organization/TestMembershipTypeHandler.java 2011-12-08 12:10:03 UTC (rev 5279)
@@ -50,6 +50,9 @@
public void testFindMembershipTypes() throws Exception
{
assertEquals(mtHandler.findMembershipTypes().size(), 3);
+
+ createMembershipType("*", "All membership types");
+ assertEquals(mtHandler.findMembershipTypes().size(), 4);
}
/**
12 years, 5 months
exo-jcr SVN: r5278 - in jcr/trunk: exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-08 04:11:28 -0500 (Thu, 08 Dec 2011)
New Revision: 5278
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterRdbmsWorkspaceInitializer.java
Log:
EXOJCR-1639: avoiding possible issue with NullData in cache after restoring
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2011-12-07 15:54:06 UTC (rev 5277)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2011-12-08 09:11:28 UTC (rev 5278)
@@ -23,11 +23,6 @@
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
-import org.exoplatform.services.jcr.dataflow.PlainChangesLog;
-import org.exoplatform.services.jcr.dataflow.TransactionChangesLog;
-import org.exoplatform.services.jcr.datamodel.IllegalNameException;
-import org.exoplatform.services.jcr.datamodel.NodeData;
-import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.backup.JCRRestore;
import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
@@ -35,12 +30,9 @@
import org.exoplatform.services.jcr.impl.util.io.FileCleanerHolder;
import java.io.File;
-import java.io.IOException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
-import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLStreamException;
/**
* Created by The eXo Platform SAS Author : Alex Reshetnyak alex.reshetnyak(a)exoplatform.com.ua
@@ -59,7 +51,7 @@
PathNotFoundException, RepositoryException
{
super(config, repConfig, dataManager, namespaceRegistry, locationFactory, nodeTypeManager, valueFactory,
- accessManager, cleanerHolder);
+ accessManager, cleanerHolder);
restoreDir = restorePath;
@@ -75,60 +67,19 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
- public NodeData initWorkspace() throws RepositoryException
+ protected void doRestore() throws Throwable
{
+ super.doRestore();
- if (isWorkspaceInitialized())
+ // restore from incremental backup
+ JCRRestore restorer = new JCRRestore(dataManager, fileCleaner);
+ for (File incrBackupFile : JCRRestore.getIncrementalFiles(new File(restoreDir)))
{
- return (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
+ restorer.incrementalRestore(incrBackupFile);
}
-
- try
- {
- long start = System.currentTimeMillis();
-
- // restore from full backup
- PlainChangesLog changes = read();
-
- TransactionChangesLog tLog = new TransactionChangesLog(changes);
- tLog.setSystemId(Constants.JCR_CORE_RESTORE_WORKSPACE_INITIALIZER_SYSTEM_ID); // mark changes
-
- dataManager.save(tLog);
-
- // restore from incremental backup
- JCRRestore restorer = new JCRRestore(dataManager, fileCleaner);
- for (File incrBackupFile : JCRRestore.getIncrementalFiles(new File(restoreDir)))
- {
- restorer.incrementalRestore(incrBackupFile);
- }
-
- final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
-
- log.info("Workspace " + workspaceName + " restored from file " + restorePath + " in "
- + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
-
- return root;
- }
- catch (XMLStreamException e)
- {
- throw new RepositoryException("The XML file is corrupted : " + restorePath, e);
- }
- catch (FactoryConfigurationError e)
- {
- throw new RepositoryException(e);
- }
- catch (IOException e)
- {
- throw new RepositoryException(e);
- }
- catch (IllegalNameException e)
- {
- throw new RepositoryException(e);
- }
- catch (ClassNotFoundException e)
- {
- throw new RepositoryException(e);
- }
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2011-12-07 15:54:06 UTC (rev 5277)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2011-12-08 09:11:28 UTC (rev 5278)
@@ -120,6 +120,11 @@
protected final File tempDir;
+ /**
+ * Indicates if restore action in progress or not.
+ */
+ volatile private boolean isRestoreInProgress = false;
+
protected class TempOutputStream extends ByteArrayOutputStream
{
@@ -507,49 +512,49 @@
*/
public NodeData initWorkspace() throws RepositoryException
{
-
if (isWorkspaceInitialized())
{
return (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
}
+ long start = System.currentTimeMillis();
+
+ isRestoreInProgress = true;
try
{
- long start = System.currentTimeMillis();
-
- PlainChangesLog changes = read();
-
- TransactionChangesLog tLog = new TransactionChangesLog(changes);
- tLog.setSystemId(Constants.JCR_CORE_RESTORE_WORKSPACE_INITIALIZER_SYSTEM_ID); // mark changes
-
- dataManager.save(tLog);
-
- final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
-
- log.info("Workspace " + workspaceName + " restored from file " + restorePath + " in "
- + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
-
- return root;
+ doRestore();
}
- catch (XMLStreamException e)
+ catch (Throwable e)
{
throw new RepositoryException(e);
}
- catch (FactoryConfigurationError e)
+ finally
{
- throw new RepositoryException(e);
+ isRestoreInProgress = false;
}
- catch (IOException e)
- {
- throw new RepositoryException(e);
- }
- catch (IllegalNameException e)
- {
- throw new RepositoryException(e);
- }
+
+ final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
+
+ log.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
+ + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
+
+ return root;
}
/**
+ * Perform restore operation.
+ */
+ protected void doRestore() throws Throwable
+ {
+ PlainChangesLog changes = read();
+
+ TransactionChangesLog tLog = new TransactionChangesLog(changes);
+ tLog.setSystemId(Constants.JCR_CORE_RESTORE_WORKSPACE_INITIALIZER_SYSTEM_ID); // mark changes
+
+ dataManager.save(tLog);
+ }
+
+ /**
* Parse of SysView export content and fill changes log within it.
*
* @throws XMLStreamException
@@ -894,19 +899,30 @@
}
}
+ /**
+ * {@inheritDoc}
+ */
public void start()
{
}
+ /**
+ * {@inheritDoc}
+ */
public void stop()
{
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isWorkspaceInitialized()
{
try
{
- return dataManager.getItemData(Constants.ROOT_UUID) == null ? false : true;
+ // If someone invoke isWorkspaceInitialized() during restore action then NullNodeData for root node will be pushed
+ // into the cache and will be there even restore is finished and data will be placed into DB.
+ return isRestoreInProgress ? false : dataManager.getItemData(Constants.ROOT_UUID) != null;
}
catch (RepositoryException e)
{
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2011-12-07 15:54:06 UTC (rev 5277)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2011-12-08 09:11:28 UTC (rev 5278)
@@ -32,8 +32,6 @@
import org.exoplatform.services.log.Log;
import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
@@ -70,31 +68,16 @@
* {@inheritDoc}
*/
@Override
- protected void restoreAction() throws RepositoryException
+ protected void doRestore() throws Throwable
{
// restore from full rdbms backup
- fullRdbmsRestore();
+ super.doRestore();
// restore from incremental backup
JCRRestore restorer = new JCRRestore(dataManager, fileCleaner);
for (File incrBackupFile : JCRRestore.getIncrementalFiles(new File(restoreDir)))
{
- try
- {
- restorer.incrementalRestore(incrBackupFile);
- }
- catch (FileNotFoundException e)
- {
- throw new RepositoryException(e);
- }
- catch (IOException e)
- {
- throw new RepositoryException(e);
- }
- catch (ClassNotFoundException e)
- {
- throw new RepositoryException(e);
- }
+ restorer.incrementalRestore(incrBackupFile);
}
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-12-07 15:54:06 UTC (rev 5277)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-12-08 09:11:28 UTC (rev 5278)
@@ -25,8 +25,6 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
-import org.exoplatform.services.jcr.datamodel.NodeData;
-import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.backup.BackupException;
import org.exoplatform.services.jcr.impl.backup.Backupable;
import org.exoplatform.services.jcr.impl.backup.DataRestore;
@@ -65,11 +63,6 @@
protected final RepositoryService repositoryService;
/**
- * Indicates if RDBMS restore in progress or not.
- */
- volatile private boolean isRestoreInProgress = false;
-
- /**
* Constructor RdbmsWorkspaceInitializer.
*/
public RdbmsWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig,
@@ -88,59 +81,8 @@
* {@inheritDoc}
*/
@Override
- public boolean isWorkspaceInitialized()
+ protected void doRestore() throws Throwable
{
- // If someone invoke isWorkspaceInitialized() during restore then NullNodeData for root node will be pushed
- // into the cache and will be there even restore is finished and data will be placed into DB.
- return isRestoreInProgress ? false : super.isWorkspaceInitialized();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public NodeData initWorkspace() throws RepositoryException
- {
- if (isWorkspaceInitialized())
- {
- return (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
- }
-
- long start = System.currentTimeMillis();
-
- isRestoreInProgress = true;
- try
- {
- restoreAction();
- }
- finally
- {
- isRestoreInProgress = false;
- }
-
- final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
-
- log.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
- + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
-
- return root;
- }
-
- /**
- * Calls restoring methods.
- *
- * @throws RepositoryException if any Exception is occurred
- */
- protected void restoreAction() throws RepositoryException
- {
- fullRdbmsRestore();
- }
-
- /**
- * Restore from full rdbms backup.
- */
- protected void fullRdbmsRestore() throws RepositoryException
- {
List<DataRestore> dataRestorers = new ArrayList<DataRestore>();
ManageableRepository repository = null;
@@ -213,11 +155,11 @@
}
catch (BackupException e1)
{
- log.error("Can't rollback restorer", e);
+ log.error("Can't rollback restorer", e1);
}
}
- throw new RepositoryException(e);
+ throw e;
}
finally
{
@@ -248,8 +190,8 @@
}
else
{
- throw new RepositoryException("Con not set ONLYNE state for repository "
- + repository.getConfiguration().getName(), e);
+ throw new RepositoryException("Con not set ONLINE state for repository "
+ + repository.getConfiguration().getName(), e);
}
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterRdbmsWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterRdbmsWorkspaceInitializer.java 2011-12-07 15:54:06 UTC (rev 5277)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/util/TesterRdbmsWorkspaceInitializer.java 2011-12-08 09:11:28 UTC (rev 5278)
@@ -59,9 +59,9 @@
}
@Override
- public void fullRdbmsRestore() throws RepositoryException
+ public void doRestore() throws Throwable
{
- super.fullRdbmsRestore();
+ super.doRestore();
}
}
12 years, 5 months
exo-jcr SVN: r5277 - jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-07 10:54:06 -0500 (Wed, 07 Dec 2011)
New Revision: 5277
Modified:
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java
Log:
EXOJCR-847: ingoring some unknows client options during LIST command
Modified: jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2011-12-07 10:31:47 UTC (rev 5276)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/FtpCommandImpl.java 2011-12-07 15:54:06 UTC (rev 5277)
@@ -196,11 +196,17 @@
{
path = params[1];
+ // ingoring some unknows client options
if (path.startsWith("-la"))
{
path = path.substring(3);
}
+ if (path.startsWith("-a"))
+ {
+ path = path.substring(2);
+ }
+
while (path.startsWith(" "))
{
path = path.substring(1);
12 years, 5 months
exo-jcr SVN: r5276 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-12-07 05:31:47 -0500 (Wed, 07 Dec 2011)
New Revision: 5276
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
Log:
EXOJCR-1668: added examples
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-12-07 09:12:55 UTC (rev 5275)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-12-07 10:31:47 UTC (rev 5276)
@@ -275,9 +275,17 @@
</listitem>
<listitem>
- <para>Be aware, when using RDBMS you need to run "RUNSTATS ON TABLE
- <scheme>.<table> WITH DISTRIBUTION AND INDEXES ALL" for
- JCR_SITEM (or JCR_MITEM) and JCR_SVALUE (or JCR_MVALUE)
+ <para>Statistics is collected <ulink
+ url="http://publib.boulder.ibm.com/infocenter/db2luw/v9/index.jsp?topic=/com.i...">automatically</ulink>
+ starting from DB2 Version 9, however it is needed to launch
+ statistics collection manually during the very first start,
+ otherwise it could be very long. You need to run '<ulink
+ url="http://publib.boulder.ibm.com/infocenter/db2luw/v9/index.jsp?topic=/com.i...">RUNSTATS</ulink>'
+ command</para>
+
+ <programlisting>RUNSTATS ON TABLE <scheme>.<table> WITH DISTRIBUTION AND INDEXES ALL</programlisting>
+
+ <para>for JCR_SITEM (or JCR_MITEM) and JCR_SVALUE (or JCR_MVALUE)
tables.</para>
</listitem>
</itemizedlist>
@@ -300,7 +308,9 @@
distribution in tables and for optimizing join statements, but you
can manually call '<ulink
url="http://dev.mysql.com/doc/refman/5.0/en/analyze-table.html">ANALYZE</ulink>'
- to update statistics if needed.</para>
+ to update statistics if needed. For example</para>
+
+ <programlisting>ANALYZE TABLE JCR_SITEM, JCR_SVALUE</programlisting>
</listitem>
</itemizedlist>
</section>
@@ -319,8 +329,11 @@
<para>Though PostgreSQL server performs query optimization
automatically, you can manualy call '<ulink
url="http://www.postgresql.org/docs/8.1/static/sql-analyze.html">ANALYZE</ulink>'
- command to recollect statistic data which can influence the
- performance.</para>
+ command to collect statistics which can influence the performance.
+ For example</para>
+
+ <programlisting>ANALYZE JCR_SITEM
+ANALYZE JCR_SVALUE</programlisting>
</listitem>
</itemizedlist>
</section>
@@ -347,7 +360,10 @@
command '<ulink
url="http://msdn.microsoft.com/en-us/library/ms187348.aspx">UPDATE
STATISTICS</ulink>' which in very few situations may increase
- performance.</para>
+ performance. For example</para>
+
+ <programlisting>UPDATE STATISTICS JCR_SITEM
+UPDATE STATISTICS JCR_SVALUE</programlisting>
</listitem>
</itemizedlist>
</section>
@@ -364,21 +380,35 @@
command '<ulink
url="http://manuals.sybase.com/onlinebooks/group-as/asg1250e/sqlug/@Generic__B...">update
statistics</ulink>' which in very few situations may increase
- performance.</para>
+ performance. For example</para>
+
+ <programlisting>update statistics JCR_SITEM
+update statistics JCR_SVALUE</programlisting>
</listitem>
</itemizedlist>
</section>
<section>
- <title>Oracle conficuration</title>
+ <title>Oracle configuration</title>
<itemizedlist>
<listitem>
- <para>Oracle DB automatically collect data statistics to optimize
+ <para>Oracle DB automatically collects statistics to optimize
performance of queries, but you can manually call '<ulink
url="http://docs.oracle.com/cd/B13789_01/server.101/b10759/statements_4005.htm">ANALYZE</ulink>'
command to start collecting statistics immediately which may improve
- performance.</para>
+ performance. For example</para>
+
+ <programlisting>ANALYZE INDEX JCR_PK_SITEM COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SITEM_PARENT_FK COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SITEM_PARENT COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SITEM_PARENT_NAME COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SITEM_PARENT_ID COMPUTE STATISTICS
+ANALYZE INDEX JCR_PK_SVALUE COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SVALUE_PROPERTY COMPUTE STATISTICS
+ANALYZE INDEX JCR_PK_SREF COMPUTE STATISTICS
+ANALYZE INDEX JCR_IDX_SREF_PROPERTY COMPUTE STATISTICS
+ANALYZE INDEX JCR_PK_SCONTAINER COMPUTE STATISTICS</programlisting>
</listitem>
</itemizedlist>
</section>
12 years, 5 months
exo-jcr SVN: r5275 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration.
by do-not-reply＠jboss.org
Author: dkuleshov
Date: 2011-12-07 04:12:55 -0500 (Wed, 07 Dec 2011)
New Revision: 5275
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
Log:
EXOJCR-1668: added info about statistic collection
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-12-07 09:09:05 UTC (rev 5274)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2011-12-07 09:12:55 UTC (rev 5275)
@@ -273,11 +273,12 @@
$ db2stop
$ db2start</programlisting></para>
</listitem>
+
<listitem>
- <para>Be aware, when using RDBMS for reindexing need to run
- "RUNSTATS ON TABLE <scheme>.<table> WITH DISTRIBUTION
- AND INDEXES ALL" for JCR_SITEM (or JCR_MITEM) and JCR_SVALUE (or
- JCR_MVALUE) tables.</para>
+ <para>Be aware, when using RDBMS you need to run "RUNSTATS ON TABLE
+ <scheme>.<table> WITH DISTRIBUTION AND INDEXES ALL" for
+ JCR_SITEM (or JCR_MITEM) and JCR_SVALUE (or JCR_MVALUE)
+ tables.</para>
</listitem>
</itemizedlist>
</section>
@@ -293,11 +294,19 @@
consistency in your use-case. This dialect is only dedicated to the
community.</para>
</listitem>
+
+ <listitem>
+ <para>MySQL relies on collected statistics for keeping track of data
+ distribution in tables and for optimizing join statements, but you
+ can manually call '<ulink
+ url="http://dev.mysql.com/doc/refman/5.0/en/analyze-table.html">ANALYZE</ulink>'
+ to update statistics if needed.</para>
+ </listitem>
</itemizedlist>
</section>
<section>
- <title>PostgresSQL configuration</title>
+ <title>PostgreSQL configuration</title>
<itemizedlist>
<listitem>
@@ -305,6 +314,14 @@
"enable_seqscan" to "off" or "default_statistics_target" at least
"50"</para>
</listitem>
+
+ <listitem>
+ <para>Though PostgreSQL server performs query optimization
+ automatically, you can manualy call '<ulink
+ url="http://www.postgresql.org/docs/8.1/static/sql-analyze.html">ANALYZE</ulink>'
+ command to recollect statistic data which can influence the
+ performance.</para>
+ </listitem>
</itemizedlist>
</section>
@@ -321,8 +338,50 @@
documentation page "Selecting a SQL Server Collation" <ulink
url="http://msdn.microsoft.com/en-us/library/ms144250.aspx">here.</ulink></para>
</listitem>
+
+ <listitem>
+ <para>MS SQL DB server's optimizer automatically processes queries
+ to increase performance. Optimization is based on statistical data
+ which is collected automatically, but you can manually call <ulink
+ url="http://en.wikipedia.org/wiki/Transact-SQL">Transact-SQL</ulink>
+ command '<ulink
+ url="http://msdn.microsoft.com/en-us/library/ms187348.aspx">UPDATE
+ STATISTICS</ulink>' which in very few situations may increase
+ performance.</para>
+ </listitem>
</itemizedlist>
</section>
+
+ <section>
+ <title>Sybase configuration</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>Sybase DB Server optimizer automatically processes queries to
+ increase performance. Optimization is based on statistical data
+ which is collected automatically, but you can manually call <ulink
+ url="http://en.wikipedia.org/wiki/Transact-SQL">Transact-SQL</ulink>
+ command '<ulink
+ url="http://manuals.sybase.com/onlinebooks/group-as/asg1250e/sqlug/@Generic__B...">update
+ statistics</ulink>' which in very few situations may increase
+ performance.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
+
+ <section>
+ <title>Oracle conficuration</title>
+
+ <itemizedlist>
+ <listitem>
+ <para>Oracle DB automatically collect data statistics to optimize
+ performance of queries, but you can manually call '<ulink
+ url="http://docs.oracle.com/cd/B13789_01/server.101/b10759/statements_4005.htm">ANALYZE</ulink>'
+ command to start collecting statistics immediately which may improve
+ performance.</para>
+ </listitem>
+ </itemizedlist>
+ </section>
</section>
<section>
12 years, 5 months
exo-jcr SVN: r5274 - jcr/trunk/applications/exo.jcr.applications.jonas.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-07 04:09:05 -0500 (Wed, 07 Dec 2011)
New Revision: 5274
Modified:
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
Log:
EXOJCR-1042: Jonas deploying problem, JONAS 4.10.4 can work only with hsqldb 1.8.0.7
Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-12-07 08:26:56 UTC (rev 5273)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2011-12-07 09:09:05 UTC (rev 5274)
@@ -47,8 +47,9 @@
</dependency>
<dependency>
- <groupId>org.hsqldb</groupId>
+ <groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
<scope>runtime</scope>
</dependency>
</dependencies>
12 years, 5 months
exo-jcr SVN: r5273 - jcr/trunk/exo.jcr.connectors.jca/src/main/java/org/exoplatform/connectors/jcr/impl/adapter.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-12-07 03:26:56 -0500 (Wed, 07 Dec 2011)
New Revision: 5273
Modified:
jcr/trunk/exo.jcr.connectors.jca/src/main/java/org/exoplatform/connectors/jcr/impl/adapter/SessionFactoryImpl.java
Log:
EXOJCR-1042: Jonas deploying problem, SessionFactoryImpl needs to implement javax.resource.Referenceable interface
Modified: jcr/trunk/exo.jcr.connectors.jca/src/main/java/org/exoplatform/connectors/jcr/impl/adapter/SessionFactoryImpl.java
===================================================================
--- jcr/trunk/exo.jcr.connectors.jca/src/main/java/org/exoplatform/connectors/jcr/impl/adapter/SessionFactoryImpl.java 2011-12-07 07:29:23 UTC (rev 5272)
+++ jcr/trunk/exo.jcr.connectors.jca/src/main/java/org/exoplatform/connectors/jcr/impl/adapter/SessionFactoryImpl.java 2011-12-07 08:26:56 UTC (rev 5273)
@@ -26,6 +26,7 @@
import javax.jcr.Session;
import javax.naming.NamingException;
import javax.naming.Reference;
+import javax.resource.Referenceable;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionManager;
@@ -36,7 +37,7 @@
* @version $Id$
*
*/
-public class SessionFactoryImpl implements SessionFactory
+public class SessionFactoryImpl implements SessionFactory, Referenceable
{
/**
12 years, 5 months