exo-jcr SVN: r2347 - in kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container: definition and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-04-30 14:16:15 -0400 (Fri, 30 Apr 2010)
New Revision: 2347
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManager.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java
Log:
EXOJCR-711: The changes done are the following:
1. In ContainerUtil, we retrieve the path before opening the stream to avoid getting null path in the error message
2. The constants related to the configuration logging have been moved from ConfigurationManagerImpl to ConfigurationManager in order to be able to use it in other classes without adding a dependency to an implementation
3. Some info messages have me added to PortalContainerConfig to give more information about how the external settings are loaded
4. In J2EEServerInfo, a "System.out.println" has been replaced with a "log.info"
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManager.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManager.java 2010-04-30 14:53:46 UTC (rev 2346)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManager.java 2010-04-30 18:16:15 UTC (rev 2347)
@@ -34,6 +34,18 @@
*/
public interface ConfigurationManager
{
+ /**
+ * The name of the system property that indicates whether the logger of the configuration
+ * must be in debug more or not.
+ */
+ public static final String LOG_DEBUG_PROPERTY = "org.exoplatform.container.configuration.debug";
+
+ /**
+ * Constant that indicates whether the logger of the configuration
+ * must be in debug more or not.
+ */
+ public static final boolean LOG_DEBUG = System.getProperty(LOG_DEBUG_PROPERTY) != null;
+
public Configuration getConfiguration();
public Component getComponent(String service);
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-04-30 14:53:46 UTC (rev 2346)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/configuration/ConfigurationManagerImpl.java 2010-04-30 18:16:15 UTC (rev 2347)
@@ -48,10 +48,6 @@
{
final static public String WAR_CONF_LOCATION = "/WEB-INF";
- final static public String LOG_DEBUG_PROPERTY = "org.exoplatform.container.configuration.debug";
-
- final static public boolean LOG_DEBUG = System.getProperty(LOG_DEBUG_PROPERTY) != null;
-
private static final Log log = ExoLogger.getLogger("exo.kernel.container.ConfigurationManagerImpl");
protected Configuration configurations_;
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-04-30 14:53:46 UTC (rev 2346)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/definition/PortalContainerConfig.java 2010-04-30 18:16:15 UTC (rev 2347)
@@ -803,12 +803,29 @@
{
// The file exists so we will use it
url = file.toURI().toURL();
+ if (ConfigurationManager.LOG_DEBUG)
+ {
+ log.info("The external settings could be found in the directory ${exo-conf}/portal, "
+ + "it will be used as external settings of the "
+ + (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
+ }
}
+ else if (ConfigurationManager.LOG_DEBUG)
+ {
+ log.info("No external settings could be found in the directory ${exo-conf}/portal for the "
+ + (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
+ }
}
if (url == null)
{
// We assume that the path is an eXo standard path
url = cm.getURL(path);
+ if (ConfigurationManager.LOG_DEBUG)
+ {
+ log.info("Trying to retrieve the external settings from the url '" + url
+ + "', it will be used as external settings of the "
+ + (isPath4DefaultPCD ? "default portal container" : "portal container '" + def.getName() + "'"));
+ }
}
// We load the properties from the url found
return ContainerUtil.loadProperties(url, false);
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2010-04-30 14:53:46 UTC (rev 2346)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/monitor/jvm/J2EEServerInfo.java 2010-04-30 18:16:15 UTC (rev 2347)
@@ -18,6 +18,9 @@
*/
package org.exoplatform.container.monitor.jvm;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.io.File;
import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
@@ -32,6 +35,10 @@
*/
public class J2EEServerInfo
{
+ /**
+ * The logger
+ */
+ private static final Log log = ExoLogger.getLogger("exo.kernel.container.J2EEServerInfo");
/**
* The name of the JVM parameter that allows us to change the location of the
@@ -158,7 +165,7 @@
String exoConfHome = System.getProperty(EXO_CONF_PARAM);
if (exoConfHome != null && exoConfHome.length() > 0)
{
- System.out.println("[INFO] Override exo-conf directory '" + exoConfDir_ + "' with location '" + exoConfHome
+ log.info("Override exo-conf directory '" + exoConfDir_ + "' with location '" + exoConfHome
+ "'");
exoConfDir_ = exoConfHome;
}
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java 2010-04-30 14:53:46 UTC (rev 2346)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/util/ContainerUtil.java 2010-04-30 18:16:15 UTC (rev 2347)
@@ -227,8 +227,8 @@
//
if (url != null)
{
+ path = url.getPath();
in = url.openStream();
- path = url.getPath();
}
//
13 years, 12 months
exo-jcr SVN: r2346 - jcr/branches.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-04-30 10:53:46 -0400 (Fri, 30 Apr 2010)
New Revision: 2346
Added:
jcr/branches/1.12-LIC-701/
Log:
Branch for experiments with Solr (EXOJCR-701)
Copied: jcr/branches/1.12-LIC-701 (from rev 2345, jcr/trunk)
13 years, 12 months
exo-jcr SVN: r2345 - jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-04-30 09:56:48 -0400 (Fri, 30 Apr 2010)
New Revision: 2345
Modified:
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
Log:
EXOJCR-635: Avoid unneccesary checks in persistence
Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2010-04-30 09:37:45 UTC (rev 2344)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2010-04-30 13:56:48 UTC (rev 2345)
@@ -416,7 +416,9 @@
int version;
PropertyImpl prevProp;
PropertyDefinitionDatas defs;
- ItemImpl prevItem = dataManager.getItem(parentNode.nodeData(), new QPathEntry(propertyName, 0), true);
+ ItemImpl prevItem =
+ dataManager.getItem(parentNode.nodeData(), new QPathEntry(propertyName, 0), true, dataManager.isNew(parentNode
+ .getIdentifier()));
NodeTypeDataManager ntm = session.getWorkspace().getNodeTypesHolder();
NodeData parentData = (NodeData)parentNode.getData();
Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-04-30 09:37:45 UTC (rev 2344)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2010-04-30 13:56:48 UTC (rev 2345)
@@ -200,6 +200,15 @@
*/
public ItemData getItemData(NodeData parent, QPathEntry name) throws RepositoryException
{
+ return getItemData(parent, name, false);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ private ItemData getItemData(NodeData parent, QPathEntry name, boolean skipCheckInPersistence)
+ throws RepositoryException
+ {
if (name.getName().equals(JCRPath.PARENT_RELPATH) && name.getNamespace().equals(Constants.NS_DEFAULT_URI))
{
if (parent.getIdentifier().equals(Constants.ROOT_UUID))
@@ -219,7 +228,10 @@
if (state == null)
{
// 2. Try from txdatamanager
- data = transactionableManager.getItemData(parent, name);
+ if (!(skipCheckInPersistence))
+ {
+ data = transactionableManager.getItemData(parent, name);
+ }
}
else if (!state.isDeleted())
{
@@ -290,6 +302,45 @@
}
/**
+ * Return Item by parent NodeDada and the name of searched item.
+ *
+ * @param parent
+ * - parent of the searched item
+ * @param name
+ * - item name
+ * @param pool
+ * - indicates does the item fall in pool
+ * @param skipCheckInPersistence
+ * - skip getting Item from persistence if need
+ * @return existed item or null if not found
+ * @throws RepositoryException
+ */
+ public ItemImpl getItem(NodeData parent, QPathEntry name, boolean pool, boolean skipCheckInPersistence)
+ throws RepositoryException
+ {
+ long start = System.currentTimeMillis();
+ if (log.isDebugEnabled())
+ {
+ log.debug("getItem(" + parent.getQPath().getAsString() + " + " + name.getAsString() + " ) >>>>>");
+ }
+
+ ItemImpl item = null;
+ try
+ {
+ return item = readItem(getItemData(parent, name, skipCheckInPersistence), pool);
+ }
+ finally
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("getItem(" + parent.getQPath().getAsString() + " + " + name.getAsString() + ") --> "
+ + (item != null ? item.getPath() : "null") + " <<<<< " + ((System.currentTimeMillis() - start) / 1000d)
+ + "sec");
+ }
+ }
+ }
+
+ /**
* Return Item by parent NodeDada and array of QPathEntry which represent a relative path to the
* searched item
*
13 years, 12 months
exo-jcr SVN: r2344 - in jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-04-30 05:37:45 -0400 (Fri, 30 Apr 2010)
New Revision: 2344
Added:
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/AddNamespacePluginHolder.java
Modified:
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java
Log:
EXOJCR-570: registers namespace before repository start and persists it
Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-04-29 14:34:43 UTC (rev 2343)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-04-30 09:37:45 UTC (rev 2344)
@@ -19,6 +19,7 @@
package org.exoplatform.services.jcr.impl;
import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.component.ComponentPlugin;
import org.exoplatform.container.jmx.MX4JComponentAdapterFactory;
import org.exoplatform.management.annotations.Managed;
import org.exoplatform.management.annotations.ManagedDescription;
@@ -31,6 +32,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
+import org.exoplatform.services.jcr.impl.core.AddNamespacePluginHolder;
import org.exoplatform.services.jcr.impl.core.LocationFactory;
import org.exoplatform.services.jcr.impl.core.NamespaceDataPersister;
import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl;
@@ -100,17 +102,52 @@
private final Log log = ExoLogger.getLogger("exo.jcr.component.core.RepositoryContainer");
/**
+ * List of AddNamespacePlugin.
+ */
+ private List<ComponentPlugin> addNamespacePlugins;
+
+ /**
* RepositoryContainer constructor.
*
* @param parent
* container
* @param config
* Repository configuration
+ * @param addNamespacePlugins
+ * list of addNamespacePlugin
* @throws RepositoryException
* container initialization error
* @throws RepositoryConfigurationException
* configuration error
*/
+ public RepositoryContainer(ExoContainer parent, RepositoryEntry config, List<ComponentPlugin> addNamespacePlugins)
+ throws RepositoryException, RepositoryConfigurationException
+ {
+
+ super(new MX4JComponentAdapterFactory(), parent);
+
+ // Defaults:
+ if (config.getAccessControl() == null)
+ config.setAccessControl(AccessControlPolicy.OPTIONAL);
+
+ this.config = config;
+ this.addNamespacePlugins = addNamespacePlugins;
+
+ registerComponents();
+ }
+
+ /**
+ * RepositoryContainer constructor.
+ *
+ * @param parent
+ * container
+ * @param config
+ * Repository configuration
+ * @throws RepositoryException
+ * container initialization error
+ * @throws RepositoryConfigurationException
+ * configuration error
+ */
public RepositoryContainer(ExoContainer parent, RepositoryEntry config) throws RepositoryException,
RepositoryConfigurationException
{
@@ -503,7 +540,6 @@
private void registerRepositoryComponents() throws RepositoryConfigurationException, RepositoryException
{
-
registerComponentImplementation(IdGenerator.class);
registerComponentImplementation(RepositoryIndexSearcherHolder.class);
@@ -512,6 +548,8 @@
registerComponentImplementation(LocationFactory.class);
registerComponentImplementation(ValueFactoryImpl.class);
+ registerComponentInstance(new AddNamespacePluginHolder(addNamespacePlugins));
+
registerComponentImplementation(JCRNodeTypeDataPersister.class);
registerComponentImplementation(NamespaceDataPersister.class);
registerComponentImplementation(NamespaceRegistryImpl.class);
Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-04-29 14:34:43 UTC (rev 2343)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-04-30 09:37:45 UTC (rev 2344)
@@ -31,6 +31,7 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
import org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener;
+import org.exoplatform.services.jcr.impl.core.AddNamespacePluginHolder;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
import org.exoplatform.services.log.ExoLogger;
@@ -147,7 +148,7 @@
throw new RepositoryConfigurationException("Repository container " + rEntry.getName() + " already started");
}
- RepositoryContainer repositoryContainer = new RepositoryContainer(parentContainer, rEntry);
+ RepositoryContainer repositoryContainer = new RepositoryContainer(parentContainer, rEntry, addNamespacesPlugins);
// Storing and starting the repository container under
// key=repository_name
@@ -156,8 +157,6 @@
repositoryContainers.put(rEntry.getName(), repositoryContainer);
managerStartChanges.registerListeners(repositoryContainer);
- addNamespaces(rEntry.getName());
-
repositoryContainer.start();
}
catch (Throwable t)
@@ -299,53 +298,6 @@
managerStartChanges.cleanup();
}
- private void addNamespaces() throws RepositoryException
- {
-
- for (RepositoryEntry repoConfig : config.getRepositoryConfigurations())
- {
- addNamespaces(repoConfig.getName());
- }
- }
-
- private void addNamespaces(String repositoryName) throws RepositoryException
- {
-
- ManageableRepository repository = getRepository(repositoryName);
- NamespaceRegistry nsRegistry = repository.getNamespaceRegistry();
-
- for (int j = 0; j < addNamespacesPlugins.size(); j++)
- {
- AddNamespacesPlugin plugin = (AddNamespacesPlugin)addNamespacesPlugins.get(j);
- Map<String, String> namespaces = plugin.getNamespaces();
- try
- {
- for (Map.Entry<String, String> namespace : namespaces.entrySet())
- {
-
- String prefix = namespace.getKey();
- String uri = namespace.getValue();
-
- // register namespace if not found
- try
- {
- nsRegistry.getURI(prefix);
- }
- catch (NamespaceException e)
- {
- nsRegistry.registerNamespace(prefix, uri);
- }
- if (log.isDebugEnabled())
- log.debug("Namespace is registered " + prefix + " = " + uri);
- }
- }
- catch (Exception e)
- {
- log.error("Error load namespaces ", e);
- }
- }
- }
-
private void init(ExoContainer container) throws RepositoryConfigurationException, RepositoryException
{
this.parentContainer = container;
Added: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/AddNamespacePluginHolder.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/AddNamespacePluginHolder.java (rev 0)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/AddNamespacePluginHolder.java 2010-04-30 09:37:45 UTC (rev 2344)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2010 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.jcr.impl.core;
+
+import org.exoplatform.container.component.ComponentPlugin;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * AddNamespacePluginHolder is used in NamespaceRegistryImpl for registration
+ * namespaces from xml-configuration after repository start.
+ *
+ * @author <a href="anatoliy.bazko(a)exoplatform.org">Anatoliy Bazko</a>
+ * @version $Id: AddNamespacePluginHolder.java 111 2010-11-11 11:11:11Z tolusha $
+ */
+public class AddNamespacePluginHolder
+{
+ private final List<ComponentPlugin> addNamespacesPlugins;
+
+ /**
+ * AddNamespacePluginHolder constructor.
+ *
+ * @param componentPlugins
+ * list of AddNamespacesPlugins
+ */
+ public AddNamespacePluginHolder(List<ComponentPlugin> componentPlugins)
+ {
+ this.addNamespacesPlugins = new ArrayList<ComponentPlugin>(componentPlugins);
+ }
+
+ /**
+ * @return unmodifiable list of AddNamespacesPlugins
+ */
+ public List<ComponentPlugin> getAddNamespacesPlugins()
+ {
+ return Collections.unmodifiableList(addNamespacesPlugins);
+ }
+}
Modified: jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2010-04-29 14:34:43 UTC (rev 2343)
+++ jcr/branches/1.14.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2010-04-30 09:37:45 UTC (rev 2344)
@@ -18,8 +18,10 @@
*/
package org.exoplatform.services.jcr.impl.core;
+import org.exoplatform.container.component.ComponentPlugin;
import org.exoplatform.services.jcr.dataflow.DataManager;
import org.exoplatform.services.jcr.datamodel.ItemData;
+import org.exoplatform.services.jcr.impl.AddNamespacesPlugin;
import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -99,6 +101,8 @@
private NamespaceDataPersister persister;
+ private AddNamespacePluginHolder addNamespacePluginHolder;
+
/**
* for tests.
*/
@@ -106,19 +110,35 @@
{
this.namespaces = new HashMap<String, String>(DEF_NAMESPACES);
this.prefixes = new HashMap<String, String>(DEF_PREFIXES);
+
this.dataManager = null;
this.indexSearcherHolder = null;
+ this.persister = null;
+ this.addNamespacePluginHolder = null;
}
public NamespaceRegistryImpl(NamespaceDataPersister persister, DataManager dataManager,
RepositoryIndexSearcherHolder indexSearcherHolder)
{
+ this.namespaces = new HashMap<String, String>(DEF_NAMESPACES);
+ this.prefixes = new HashMap<String, String>(DEF_PREFIXES);
this.dataManager = dataManager;
this.indexSearcherHolder = indexSearcherHolder;
+ this.persister = persister;
+ this.addNamespacePluginHolder = null;
+ }
+
+ public NamespaceRegistryImpl(NamespaceDataPersister persister, DataManager dataManager,
+ RepositoryIndexSearcherHolder indexSearcherHolder, AddNamespacePluginHolder addNamespacePluginHolder)
+ {
this.namespaces = new HashMap<String, String>(DEF_NAMESPACES);
this.prefixes = new HashMap<String, String>(DEF_PREFIXES);
+
+ this.dataManager = dataManager;
+ this.indexSearcherHolder = indexSearcherHolder;
this.persister = persister;
+ this.addNamespacePluginHolder = addNamespacePluginHolder;
}
/**
@@ -257,7 +277,6 @@
{
if (!started)
{
-
// save default
if (persister != null)
{
@@ -278,6 +297,12 @@
throw new RuntimeException(e.getLocalizedMessage(), e);
}
}
+
+ if (addNamespacePluginHolder != null)
+ {
+ addPendingNamespaces();
+ }
+
started = true;
}
}
@@ -370,4 +395,37 @@
}
+ private void addPendingNamespaces()
+ {
+ for (ComponentPlugin plugin : addNamespacePluginHolder.getAddNamespacesPlugins())
+ {
+ Map<String, String> namespaces = ((AddNamespacesPlugin)plugin).getNamespaces();
+ try
+ {
+ for (Map.Entry<String, String> namespace : namespaces.entrySet())
+ {
+
+ String prefix = namespace.getKey();
+ String uri = namespace.getValue();
+
+ // register namespace if not found
+ try
+ {
+ getURI(prefix);
+ }
+ catch (NamespaceException e)
+ {
+ registerNamespace(prefix, uri);
+ }
+ if (log.isDebugEnabled())
+ log.debug("Namespace is registered " + prefix + " = " + uri);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("Error load namespaces ", e);
+ }
+ }
+ }
+
}
13 years, 12 months
exo-jcr SVN: r2343 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/dataflow/persistent and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-04-29 10:34:43 -0400 (Thu, 29 Apr 2010)
New Revision: 2343
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
Log:
EXOJCR-692: improve Node.hasNodes()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java 2010-04-28 15:20:24 UTC (rev 2342)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/persistent/WorkspaceStorageCache.java 2010-04-29 14:34:43 UTC (rev 2343)
@@ -65,6 +65,13 @@
List<NodeData> getChildNodes(NodeData parent);
/**
+ * @param parent
+ * @return child nodes count for parent if found; 0 if no items found; -1 if no items
+ * initialized
+ */
+ int getChildNodesCount(NodeData parent);
+
+ /**
* Get node child properties.<br/>
*
* @param parent
@@ -136,23 +143,20 @@
* @return long value
*/
long getSize();
-
+
/**
* Start buffering process.
*/
public void beginTransaction();
-
/**
* Sort changes and commit data to the cache.
*/
public void commitTransaction();
-
/**
* Forget about changes
*/
public void rollbackTransaction();
-
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-04-28 15:20:24 UTC (rev 2342)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2010-04-29 14:34:43 UTC (rev 2343)
@@ -94,7 +94,7 @@
* GET_LIST_PROPERTIES type.
*/
static private final int GET_LIST_PROPERTIES = 5;
-
+
/**
* Request type.
*/
@@ -341,10 +341,10 @@
{
if (cache.isEnabled())
{
- List<NodeData> childNodes = cache.getChildNodes(parent);
- if (childNodes != null)
+ int childCount = cache.getChildNodesCount(parent);
+ if (childCount >= 0)
{
- return childNodes.size();
+ return childCount;
}
}
@@ -386,7 +386,7 @@
if (data == null)
{
final DataRequest request = new DataRequest(parentData.getIdentifier(), name);
-
+
try
{
request.start();
@@ -395,12 +395,12 @@
data = getCachedItemData(parentData, name);
if (data == null)
{
- data = getPersistedItemData(parentData, name);
+ data = getPersistedItemData(parentData, name);
}
else if (!data.isNode())
{
fixPropertyValues((PropertyData)data);
- }
+ }
}
finally
{
@@ -427,7 +427,7 @@
if (data == null)
{
final DataRequest request = new DataRequest(identifier);
-
+
try
{
request.start();
@@ -436,7 +436,7 @@
data = getCachedItemData(identifier);
if (data == null)
{
- data = getPersistedItemData(identifier);
+ data = getPersistedItemData(identifier);
}
else if (!data.isNode())
{
@@ -733,7 +733,7 @@
finally
{
request.done();
- }
+ }
}
protected boolean isTxAware()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-04-28 15:20:24 UTC (rev 2342)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LinkedWorkspaceStorageCacheImpl.java 2010-04-29 14:34:43 UTC (rev 2343)
@@ -1439,6 +1439,59 @@
/**
* {@inheritDoc}
*/
+ public int getChildNodesCount(NodeData parentData)
+ {
+ if (enabled && parentData != null)
+ {
+ long start = System.currentTimeMillis();
+ try
+ {
+ // we assume that parent cached too
+ final List<NodeData> cn = nodesCache.get(parentData.getIdentifier());
+
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug(name + ", getChildNodesCount() " + parentData.getQPath().getAsString() + " "
+ + parentData.getIdentifier());
+ final StringBuffer blog = new StringBuffer();
+ if (cn != null)
+ {
+ blog.append("\n");
+ for (NodeData nd : cn)
+ {
+ blog.append("\t\t" + nd.getQPath().getAsString() + " " + nd.getIdentifier() + "\n");
+ }
+ LOG.debug("\t-->" + blog.toString());
+ }
+ else
+ {
+ LOG.debug("\t--> null");
+ }
+ }
+
+ if (cn != null)
+ hits++;
+ else
+ miss++;
+ return cn != null ? cn.size() : -1;
+ }
+ catch (Exception e)
+ {
+ LOG.error(name + ", Error in getChildNodesCount() parentData: "
+ + (parentData != null ? parentData.getQPath().getAsString() : "[null]"), e);
+ }
+ finally
+ {
+ totalGetTime += System.currentTimeMillis() - start;
+ }
+ }
+
+ return -1; // nothing cached
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public List<PropertyData> getChildProperties(final NodeData parentData)
{
if (enabled && parentData != null)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-28 15:20:24 UTC (rev 2342)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-04-29 14:34:43 UTC (rev 2343)
@@ -260,7 +260,7 @@
*/
public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, TransactionService transactionService,
ConfigurationManager cfm) throws RepositoryException, RepositoryConfigurationException
- {
+ {
if (wsConfig.getCache() == null)
{
throw new RepositoryConfigurationException("Cache configuration not found");
@@ -294,7 +294,7 @@
{
// force set expiration key to default value in all Expiration configurations (if any)
((ExpirationAlgorithmConfig)evictionRegionConfig.getEvictionAlgorithmConfig())
- .setExpirationKeyName(ExpirationAlgorithmConfig.EXPIRATION_KEY);
+ .setExpirationKeyName(ExpirationAlgorithmConfig.EXPIRATION_KEY);
useExpiration = true;
}
}
@@ -306,8 +306,8 @@
// if expiration is used, set appropriate factory with with timeout set via configuration (or default one 15minutes)
this.cache =
- new BufferedJBossCache(factory.createCache(wsConfig.getCache()), useExpiration,
- wsConfig.getCache().getParameterTime(JBOSSCACHE_EXPIRATION, JBOSSCACHE_EXPIRATION_DEFAULT));
+ new BufferedJBossCache(factory.createCache(wsConfig.getCache()), useExpiration, wsConfig.getCache()
+ .getParameterTime(JBOSSCACHE_EXPIRATION, JBOSSCACHE_EXPIRATION_DEFAULT));
this.itemsRoot = Fqn.fromElements(ITEMS);
this.childNodes = Fqn.fromElements(CHILD_NODES);
@@ -323,7 +323,7 @@
createResidentNode(childProps);
createResidentNode(childPropsList);
createResidentNode(itemsRoot);
- }
+ }
/**
* Cache constructor with JBossCache JTA transaction support.
@@ -333,7 +333,7 @@
* @throws RepositoryConfigurationException if error of configuration
*/
public JBossCacheWorkspaceStorageCache(WorkspaceEntry wsConfig, ConfigurationManager cfm)
- throws RepositoryException, RepositoryConfigurationException
+ throws RepositoryException, RepositoryConfigurationException
{
this(wsConfig, null, cfm);
}
@@ -621,12 +621,13 @@
*/
public List<NodeData> getChildNodes(final NodeData parent)
{
- final List<NodeData> childs = new ArrayList<NodeData>();
// get list of children uuids
final Set<Object> set =
(Set<Object>)cache.get(makeChildListFqn(childNodesList, parent.getIdentifier()), ITEM_LIST);
if (set != null)
{
+ final List<NodeData> childs = new ArrayList<NodeData>();
+
for (Object child : set)
{
NodeData node = (NodeData)cache.get(makeItemFqn((String)child), ITEM_DATA);
@@ -652,6 +653,18 @@
/**
* {@inheritDoc}
*/
+ public int getChildNodesCount(NodeData parent)
+ {
+ // get list of children uuids
+ final Set<Object> set =
+ (Set<Object>)cache.get(makeChildListFqn(childNodesList, parent.getIdentifier()), ITEM_LIST);
+
+ return set != null ? set.size() : -1;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public List<PropertyData> getChildProperties(NodeData parent)
{
return getChildProps(parent.getIdentifier(), true);
@@ -674,11 +687,12 @@
*/
protected List<PropertyData> getChildProps(String parentId, boolean withValue)
{
- final List<PropertyData> childs = new ArrayList<PropertyData>();
// get set of property uuids
final Set<Object> set = (Set<Object>)cache.get(makeChildListFqn(childPropsList, parentId), ITEM_LIST);
if (set != null)
{
+ final List<PropertyData> childs = new ArrayList<PropertyData>();
+
for (Object child : set)
{
PropertyData prop = (PropertyData)cache.get(makeItemFqn((String)child), ITEM_DATA);
@@ -813,7 +827,7 @@
{
// add in CHILD_NODES
cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node.getQPath()
- .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
.getParentIdentifier())) != null)
@@ -834,7 +848,7 @@
{
// add in CHILD_NODES
cache.put(makeChildFqn(childNodes, node.getParentIdentifier(), node.getQPath().getEntries()[node.getQPath()
- .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, node.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childNodesList, node
.getParentIdentifier())) != null)
@@ -858,7 +872,7 @@
{
// add in CHILD_PROPS
cache.put(makeChildFqn(childProps, prop.getParentIdentifier(), prop.getQPath().getEntries()[prop.getQPath()
- .getEntries().length - 1]), ITEM_ID, prop.getIdentifier());
+ .getEntries().length - 1]), ITEM_ID, prop.getIdentifier());
// if MODIFY and List present OR FORCE_MODIFY, then write
if ((modifyListsOfChild == ModifyChildOption.MODIFY && cache.getNode(makeChildListFqn(childPropsList, prop
.getParentIdentifier())) != null)
@@ -880,7 +894,7 @@
// remove from CHILD_NODES of parent
cache.removeNode(makeChildFqn(childNodes, item.getParentIdentifier(), item.getQPath().getEntries()[item
- .getQPath().getEntries().length - 1]));
+ .getQPath().getEntries().length - 1]));
// remove from CHILD_NODES_LIST of parent
cache.removeFromList(makeChildListFqn(childNodesList, item.getParentIdentifier()), ITEM_LIST, item
@@ -903,7 +917,7 @@
{
// remove from CHILD_PROPS
cache.removeNode(makeChildFqn(childProps, item.getParentIdentifier(), item.getQPath().getEntries()[item
- .getQPath().getEntries().length - 1]));
+ .getQPath().getEntries().length - 1]));
// remove from CHILD_PROPS_LIST
cache.removeFromList(makeChildListFqn(childPropsList, item.getParentIdentifier()), ITEM_LIST, item
@@ -948,7 +962,7 @@
// get previously cached NodeData and using its name remove child on the parent
Fqn<String> prevFqn =
makeChildFqn(childNodes, node.getParentIdentifier(), prevNode.getQPath().getEntries()[prevNode.getQPath()
- .getEntries().length - 1]);
+ .getEntries().length - 1]);
if (node.getIdentifier().equals(cache.get(prevFqn, ITEM_ID)))
{
// it's same-name siblings re-ordering, delete previous child
@@ -978,7 +992,7 @@
// get previously cached NodeData and using its name remove child on the parent
Fqn<String> prevFqn =
makeChildFqn(childNodes, node.getParentIdentifier(), prevNode.getQPath().getEntries()[prevNode.getQPath()
- .getEntries().length - 1]);
+ .getEntries().length - 1]);
if (node.getIdentifier().equals(cache.getFromBuffer(prevFqn, ITEM_ID)))
{
// it's same-name siblings re-ordering, delete previous child
@@ -1014,15 +1028,15 @@
PropertyData prevProp = iter.next();
if (inheritACL
- && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName()
- .equals(Constants.EXO_OWNER)))
+ && (prevProp.getQPath().getName().equals(Constants.EXO_PERMISSIONS) || prevProp.getQPath().getName()
+ .equals(Constants.EXO_OWNER)))
{
inheritACL = false;
}
// recreate with new path for child Props only
QPath newPath =
QPath
- .makeChildPath(rootPath, prevProp.getQPath().getEntries()[prevProp.getQPath().getEntries().length - 1]);
+ .makeChildPath(rootPath, prevProp.getQPath().getEntries()[prevProp.getQPath().getEntries().length - 1]);
TransientPropertyData newProp =
new TransientPropertyData(newPath, prevProp.getIdentifier(), prevProp.getPersistedVersion(), prevProp
.getType(), prevProp.getParentIdentifier(), prevProp.isMultiValued(), prevProp.getValues());
@@ -1036,7 +1050,7 @@
// recreate with new path for child Nodes only
QPath newPath =
QPath
- .makeChildPath(rootPath, prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1]);
+ .makeChildPath(rootPath, prevNode.getQPath().getEntries()[prevNode.getQPath().getEntries().length - 1]);
TransientNodeData newNode =
new TransientNodeData(newPath, prevNode.getIdentifier(), prevNode.getPersistedVersion(), prevNode
.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode
@@ -1071,7 +1085,7 @@
TransientNodeData newNode =
new TransientNodeData(prevNode.getQPath(), prevNode.getIdentifier(), prevNode.getPersistedVersion(),
prevNode.getPrimaryTypeName(), prevNode.getMixinTypeNames(), prevNode.getOrderNumber(), prevNode
- .getParentIdentifier(), acl);
+ .getParentIdentifier(), acl);
// update this node
cache.put(makeItemFqn(newNode.getIdentifier()), ITEM_DATA, newNode);
// update childs recursive
@@ -1110,4 +1124,5 @@
private enum ModifyChildOption {
NOT_MODIFY, MODIFY, FORCE_MODIFY
}
+
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-04-28 15:20:24 UTC (rev 2342)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCacheableWorkspaceDataManager.java 2010-04-29 14:34:43 UTC (rev 2343)
@@ -53,6 +53,7 @@
{
private static final int READER = 100;
+
private static final int TIMES = 20;
private CacheableWorkspaceDataManager cwdm;
@@ -96,7 +97,7 @@
startSignal.await();
for (int i = 0; i < TIMES; i++)
{
- task.execute();
+ task.execute();
}
}
catch (Exception e)
@@ -120,9 +121,9 @@
e.printStackTrace();
}
throw errors.get(0);
- }
+ }
}
-
+
public void testGetItemById() throws Exception
{
assertEquals(0, con.getItemDataByIdCalls.get());
@@ -132,15 +133,15 @@
{
ItemData item = cwdm.getItemData("getItemData");
assertNotNull(item);
- }
+ }
};
multiThreadingTest(task);
assertEquals(1, con.getItemDataByIdCalls.get());
}
-
+
public void testGetItemDataByNodeDataNQPathEntry() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("getItemData", null, null, 0, 1, null, null, null);
+ final NodeData nodeData = new PersistedNodeData("getItemData", null, null, 0, 1, null, null, null);
assertEquals(0, con.getItemDataByNodeDataNQPathEntryCalls.get());
MyTask task = new MyTask()
{
@@ -148,15 +149,15 @@
{
ItemData item = cwdm.getItemData(nodeData, new QPathEntry("http://www.foo.com", "foo", 0));
assertNotNull(item);
- }
+ }
};
multiThreadingTest(task);
assertEquals(1, con.getItemDataByNodeDataNQPathEntryCalls.get());
}
-
+
public void testGetChildPropertiesData() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("getChildPropertiesData", null, null, 0, 1, null, null, null);
+ final NodeData nodeData = new PersistedNodeData("getChildPropertiesData", null, null, 0, 1, null, null, null);
assertEquals(0, con.getChildPropertiesDataCalls.get());
MyTask task = new MyTask()
{
@@ -165,7 +166,7 @@
List<PropertyData> properties = cwdm.getChildPropertiesData(nodeData);
assertNotNull(properties);
assertFalse(properties.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1, con.getChildPropertiesDataCalls.get());
@@ -176,15 +177,15 @@
List<PropertyData> properties = cwdm.getChildPropertiesData(nodeData, true);
assertNotNull(properties);
assertFalse(properties.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1 + READER * TIMES, con.getChildPropertiesDataCalls.get());
}
-
+
public void testListChildPropertiesData() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("listChildPropertiesData", null, null, 0, 1, null, null, null);
+ final NodeData nodeData = new PersistedNodeData("listChildPropertiesData", null, null, 0, 1, null, null, null);
assertEquals(0, con.listChildPropertiesDataCalls.get());
MyTask task = new MyTask()
{
@@ -193,7 +194,7 @@
List<PropertyData> properties = cwdm.listChildPropertiesData(nodeData);
assertNotNull(properties);
assertFalse(properties.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1, con.listChildPropertiesDataCalls.get());
@@ -204,15 +205,15 @@
List<PropertyData> properties = cwdm.listChildPropertiesData(nodeData, true);
assertNotNull(properties);
assertFalse(properties.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1 + READER * TIMES, con.listChildPropertiesDataCalls.get());
}
-
+
public void testGetChildNodes() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("getChildNodes", null, null, 0, 1, null, null, null);
+ final NodeData nodeData = new PersistedNodeData("getChildNodes", null, null, 0, 1, null, null, null);
assertEquals(0, con.getChildNodesDataCalls.get());
MyTask task = new MyTask()
{
@@ -221,7 +222,7 @@
List<NodeData> nodes = cwdm.getChildNodesData(nodeData);
assertNotNull(nodes);
assertFalse(nodes.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1, con.getChildNodesDataCalls.get());
@@ -232,15 +233,15 @@
List<NodeData> nodes = cwdm.getChildNodesData(nodeData, true);
assertNotNull(nodes);
assertFalse(nodes.isEmpty());
- }
+ }
};
multiThreadingTest(task);
assertEquals(1 + READER * TIMES, con.getChildNodesDataCalls.get());
}
-
+
public void testGetChildNodesCount() throws Exception
{
- final NodeData nodeData = new PersistedNodeData("getChildNodesCount", null, null, 0, 1, null, null, null);
+ final NodeData nodeData = new PersistedNodeData("getChildNodesCount", null, null, 0, 1, null, null, null);
assertEquals(0, con.getChildNodesCountCalls.get());
MyTask task = new MyTask()
{
@@ -248,7 +249,7 @@
{
int result = cwdm.getChildNodesCount(nodeData);
assertEquals(1, result);
- }
+ }
};
multiThreadingTest(task);
assertEquals(READER * TIMES, con.getChildNodesCountCalls.get());
@@ -260,7 +261,7 @@
{
int result = cwdm.getChildNodesCount(nodeData);
assertEquals(1, result);
- }
+ }
};
multiThreadingTest(task);
assertEquals(READER * TIMES, con.getChildNodesCountCalls.get());
@@ -270,7 +271,7 @@
{
void execute() throws Exception;
}
-
+
private static class MyWorkspaceStorageCache implements WorkspaceStorageCache
{
@@ -363,6 +364,11 @@
{
}
+ public int getChildNodesCount(NodeData parent)
+ {
+ return childNodes != null ? childNodes.size() : -1;
+ }
+
}
private static class MyWorkspaceStorageConnection implements WorkspaceStorageConnection
@@ -463,8 +469,10 @@
IllegalStateException
{
listChildPropertiesDataCalls.incrementAndGet();
- return Arrays.asList((PropertyData)new PersistedPropertyData("listChildPropertiesData", null, null, 0, PropertyType.STRING,
- false, Arrays.asList((ValueData)new ByteArrayPersistedValueData(1, "foo".getBytes()))));
+ return Arrays
+ .asList((PropertyData)new PersistedPropertyData("listChildPropertiesData", null, null, 0,
+ PropertyType.STRING, false, Arrays
+ .asList((ValueData)new ByteArrayPersistedValueData(1, "foo".getBytes()))));
}
public void rename(NodeData data) throws RepositoryException, UnsupportedOperationException,
13 years, 12 months
exo-jcr SVN: r2342 - in jcr/branches/1.14.x: exo.jcr.component.core and 4 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-28 11:20:24 -0400 (Wed, 28 Apr 2010)
New Revision: 2342
Modified:
jcr/branches/1.14.x/exo.jcr.component.core/pom.xml
jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.14.x/pom.xml
Log:
EXOJCR-691 missing dependencies fixed
Modified: jcr/branches/1.14.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.core/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/exo.jcr.component.core/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -69,6 +69,11 @@
<dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.security.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.commons</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
@@ -149,7 +154,27 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
Modified: jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/exo.jcr.component.ext/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -90,17 +90,14 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
</dependency>
@@ -111,7 +108,15 @@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -121,10 +126,6 @@
<artifactId>picocontainer</artifactId>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
Modified: jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/exo.jcr.component.webdav/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -73,12 +73,16 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
@@ -88,7 +92,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Modified: jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/exo.jcr.connectors.localadapter/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -97,10 +97,6 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
- </dependency>
- <dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</dependency>
Modified: jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/exo.jcr.framework.command/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -69,16 +69,13 @@
<artifactId>commons-chain</artifactId>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -86,4 +83,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: jcr/branches/1.14.x/pom.xml
===================================================================
--- jcr/branches/1.14.x/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
+++ jcr/branches/1.14.x/pom.xml 2010-04-28 15:20:24 UTC (rev 2342)
@@ -300,7 +300,27 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.4.O</version>
+ </dependency>
<dependency>
<groupId>org.apache.ws.commons</groupId>
<artifactId>ws-commons-util</artifactId>
14 years
exo-jcr SVN: r2341 - jcr/trunk/exo.jcr.component.webdav.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-28 10:46:09 -0400 (Wed, 28 Apr 2010)
New Revision: 2341
Modified:
jcr/trunk/exo.jcr.component.webdav/pom.xml
Log:
EXOJCR-691 missing dependencies fixed
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-04-28 14:46:09 UTC (rev 2341)
@@ -74,10 +74,6 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
- <!-- dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency -->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
14 years
exo-jcr SVN: r2340 - in jcr/trunk: exo.jcr.component.core and 5 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-28 09:32:20 -0400 (Wed, 28 Apr 2010)
New Revision: 2340
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.statistics/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.connectors.localadapter/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/pom.xml
Log:
EXOJCR-691 missing dependencies fixed
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -68,6 +68,11 @@
<dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.security.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.ws</groupId>
+ <artifactId>exo.ws.commons</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
@@ -148,7 +153,27 @@
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts</artifactId>
@@ -190,7 +215,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<!-- ===== Databases JDBC support for tests ===== -->
<dependency>
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -90,17 +90,14 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
</dependency>
@@ -121,13 +118,18 @@
<artifactId>picocontainer</artifactId>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
Modified: jcr/trunk/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.statistics/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.component.statistics/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -29,11 +29,20 @@
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
<description>eXo JCR Statistics</description>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ </dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.component.core</artifactId>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -74,13 +74,21 @@
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
- </dependency>
+ </dependency -->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
<groupId>jtidy</groupId>
@@ -88,7 +96,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Modified: jcr/trunk/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
+ <artifactId>connector</artifactId>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -106,8 +106,8 @@
</dependency>
<dependency>
<groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
+ <artifactId>connector-api</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -65,16 +65,13 @@
<artifactId>commons-chain</artifactId>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -82,4 +79,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
+++ jcr/trunk/pom.xml 2010-04-28 13:32:20 UTC (rev 2340)
@@ -294,7 +294,27 @@
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<version>1.5.4</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.4.O</version>
+ </dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
14 years
exo-jcr SVN: r2339 - in ws/branches/2.2.x: exo.ws.rest.ext and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-28 09:28:32 -0400 (Wed, 28 Apr 2010)
New Revision: 2339
Modified:
ws/branches/2.2.x/exo.ws.commons/pom.xml
ws/branches/2.2.x/exo.ws.rest.ext/pom.xml
Log:
EXOJCR-691 missing dependencies fixed
Modified: ws/branches/2.2.x/exo.ws.commons/pom.xml
===================================================================
--- ws/branches/2.2.x/exo.ws.commons/pom.xml 2010-04-28 13:27:38 UTC (rev 2338)
+++ ws/branches/2.2.x/exo.ws.commons/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
@@ -40,6 +40,10 @@
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: ws/branches/2.2.x/exo.ws.rest.ext/pom.xml
===================================================================
--- ws/branches/2.2.x/exo.ws.rest.ext/pom.xml 2010-04-28 13:27:38 UTC (rev 2338)
+++ ws/branches/2.2.x/exo.ws.rest.ext/pom.xml 2010-04-28 13:28:32 UTC (rev 2339)
@@ -77,6 +77,10 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
14 years
exo-jcr SVN: r2338 - in ws/trunk: exo.ws.rest.ext and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-04-28 09:27:38 -0400 (Wed, 28 Apr 2010)
New Revision: 2338
Modified:
ws/trunk/exo.ws.commons/pom.xml
ws/trunk/exo.ws.rest.ext/pom.xml
Log:
EXOJCR-691 missing dependencies fixed
Modified: ws/trunk/exo.ws.commons/pom.xml
===================================================================
--- ws/trunk/exo.ws.commons/pom.xml 2010-04-28 13:26:06 UTC (rev 2337)
+++ ws/trunk/exo.ws.commons/pom.xml 2010-04-28 13:27:38 UTC (rev 2338)
@@ -40,6 +40,10 @@
<dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: ws/trunk/exo.ws.rest.ext/pom.xml
===================================================================
--- ws/trunk/exo.ws.rest.ext/pom.xml 2010-04-28 13:26:06 UTC (rev 2337)
+++ ws/trunk/exo.ws.rest.ext/pom.xml 2010-04-28 13:27:38 UTC (rev 2338)
@@ -77,6 +77,10 @@
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
</dependencies>
</project>
14 years