November 2009 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r748 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-18 06:54:25 -0500 (Wed, 18 Nov 2009) New Revision: 748 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java Log: EXOJCR-243: Updated LockData to be Externalizable. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2009-11-18 11:28:16 UTC (rev 747) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2009-11-18 11:54:25 UTC (rev 748) @@ -18,6 +18,13 @@ */ package org.exoplatform.services.jcr.impl.core.lock; +import org.exoplatform.services.jcr.impl.Constants; + +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; + /** * Created by The eXo Platform SAS. * @@ -25,7 +32,7 @@ * @version $Id$ */ -public class LockData +public class LockData implements Externalizable { /** * The time of birth. From this time we start count the time of death. death = birthday+TIME_OUT; @@ -36,14 +43,9 @@ * If isDeep is true then the lock applies to this node and all its descendant nodes; if false, * the lock applies only to this, the holding node. */ - private final boolean deep; + private boolean deep; /** - * - */ - private boolean live; - - /** * A lock token is a string that uniquely identifies a particular lock and acts as a “key” * allowing a user to alter a locked node. LockData stores only token hash. */ @@ -65,7 +67,7 @@ * expire until explicitly unlocked or automatically unlocked due to a implementation-specific * limitation, such as a timeout. */ - private final boolean sessionScoped; + private boolean sessionScoped; /** * <B>8.4.9 Timing Out</B> An implementation may unlock any lock at any time due to @@ -73,6 +75,13 @@ */ private long timeOut; + // Need for Externalizable + public LockData() + { + this.sessionScoped = false; + this.deep = false; + } + /** * @param nodeIdentifier * @param lockToken @@ -90,7 +99,6 @@ this.sessionScoped = sessionScoped; this.owner = owner; this.timeOut = timeOut; - this.live = true; this.birthday = System.currentTimeMillis() / 1000; } @@ -172,4 +180,58 @@ return timeOut; } + /** + * @see java.io.Externalizable#readExternal(java.io.ObjectInput) + */ + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException + { + // read boolean + this.deep = in.readBoolean(); + this.sessionScoped = in.readBoolean(); + // read long + this.birthday = in.readLong(); + this.timeOut = in.readLong(); + //read strings + // read uuid + byte[] buf; + buf = new byte[in.readInt()]; + in.readFully(buf); + this.nodeIdentifier = new String(buf, Constants.DEFAULT_ENCODING); + // read uuid + buf = new byte[in.readInt()]; + in.readFully(buf); + this.owner = new String(buf, Constants.DEFAULT_ENCODING); + // read uuid + buf = new byte[in.readInt()]; + in.readFully(buf); + this.tokenHash = new String(buf, Constants.DEFAULT_ENCODING); + } + + /** + * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) + */ + public void writeExternal(ObjectOutput out) throws IOException + { + // write boolean + out.writeBoolean(deep); + out.writeBoolean(sessionScoped); + // write long + out.writeLong(birthday); + out.writeLong(timeOut); + // write string + // node uuid + byte[] ptbuf = nodeIdentifier.getBytes(Constants.DEFAULT_ENCODING); + out.writeInt(ptbuf.length); + out.write(ptbuf); + // node uuid + ptbuf = owner.getBytes(Constants.DEFAULT_ENCODING); + out.writeInt(ptbuf.length); + out.write(ptbuf); + // node uuid + ptbuf = tokenHash.getBytes(Constants.DEFAULT_ENCODING); + out.writeInt(ptbuf.length); + out.write(ptbuf); + + } + }

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r747 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/core/lock and 1 other directories.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-18 06:28:16 -0500 (Wed, 18 Nov 2009) New Revision: 747 Removed: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java Log: EXOJCR-243: Updated LockData and LockImpl to new design. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2009-11-18 11:18:07 UTC (rev 746) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionImpl.java 2009-11-18 11:28:16 UTC (rev 747) @@ -176,8 +176,10 @@ this.workspace = new WorkspaceImpl(workspaceName, container, this, observationManager); - // TODO: try to get lock time out from workspace configuration, as it was before - this.sessionLockManager = new SessionLockManager(this, SessionLockManager.DEFAULT_LOCK_TIMEOUT); + // TODO: try to get lock timeout from workspace configuration, as it was before + this.sessionLockManager = + new SessionLockManager(this.getId(), this.getUserID(), this.getTransientNodesManager(), + SessionLockManager.DEFAULT_LOCK_TIMEOUT); this.lifecycleListeners = new ArrayList<SessionLifecycleListener>(); this.registerLifecycleListener((ObservationManagerImpl)observationManager); Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2009-11-18 11:18:07 UTC (rev 746) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockData.java 2009-11-18 11:28:16 UTC (rev 747) @@ -148,7 +148,7 @@ @Override public int hashCode() { - return super.hashCode() + tokenHash.hashCode(); + return tokenHash.hashCode(); } public boolean isDeep() @@ -157,14 +157,6 @@ } /** - * @return the live - */ - public boolean isLive() - { - return live; - } - - /** * @return */ public boolean isSessionScoped() @@ -173,23 +165,6 @@ } /** - * - */ - public void refresh() - { - birthday = System.currentTimeMillis(); - } - - /** - * @param the - * live to set - */ - public void setLive(boolean live) - { - this.live = live; - } - - /** * @return */ protected long getTimeOut() @@ -197,11 +172,4 @@ return timeOut; } - /** - * @param timeOut - */ - protected void setTimeOut(long timeOut) - { - this.timeOut = timeOut; - } } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2009-11-18 11:18:07 UTC (rev 746) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockImpl.java 2009-11-18 11:28:16 UTC (rev 747) @@ -19,7 +19,7 @@ package org.exoplatform.services.jcr.impl.core.lock; import org.exoplatform.services.jcr.core.lock.ExtendedLock; -import org.exoplatform.services.jcr.impl.core.SessionImpl; +import org.exoplatform.services.jcr.impl.core.SessionDataManager; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -36,8 +36,10 @@ { private LockData lockData; - private SessionImpl session; + private boolean live; + private SessionDataManager sessionDataManager; + // Token is not stored in lockData any more private String token; @@ -45,11 +47,12 @@ * @param session * @param lockData */ - public LockImpl(SessionImpl session, LockData lockData, String token) + public LockImpl(SessionDataManager sessionDataManager, LockData lockData, String token) { this.lockData = lockData; - this.session = session; + this.sessionDataManager = sessionDataManager; this.token = token; + this.live = true; } /** @@ -73,7 +76,32 @@ */ public boolean isLive() { - return lockData.isLive(); + // it is already not alive + if (!live) + { + return false; + } + // update from cache. If it is not present there - means it is not live + try + { + // node unlocked and/or re-locked with another session + LockData newlockData = sessionDataManager.getLockData(lockData.getNodeIdentifier()); + if (newlockData == null || newlockData.getTokenHash() != lockData.getTokenHash()) + { + live = false; + return false; + } + else + { + // update, whether time to death changed, or whatever + this.lockData = newlockData; + return true; + } + } + catch (RepositoryException e) + { + return false; + } } /** @@ -83,7 +111,7 @@ { if (!isLive()) throw new LockException("Lock is not live"); - lockData.refresh(); + // TODO: recreate lockData } /** @@ -93,7 +121,7 @@ { try { - return (Node)session.getTransientNodesManager().getItemByIdentifier(lockData.getNodeIdentifier(), true); + return (Node)sessionDataManager.getItemByIdentifier(lockData.getNodeIdentifier(), true); } catch (RepositoryException e) { @@ -134,12 +162,4 @@ return lockData; } - /** - * @param timeOut - */ - protected void setTimeOut(long timeOut) - { - lockData.setTimeOut(timeOut); - } - } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2009-11-18 11:18:07 UTC (rev 746) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2009-11-18 11:28:16 UTC (rev 747) @@ -30,7 +30,7 @@ import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.datamodel.QPathEntry; import org.exoplatform.services.jcr.impl.Constants; -import org.exoplatform.services.jcr.impl.core.SessionImpl; +import org.exoplatform.services.jcr.impl.core.SessionDataManager; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.observation.ExtendedEvent; @@ -76,13 +76,14 @@ */ private static final int SEARCH_CHILD = 4; - /** - * Session through which this lock manager is created - */ - private final SessionImpl session; + private String sessionID; - protected final Log log = ExoLogger.getLogger(this.getClass().getName()); + private String userId; + private SessionDataManager sessionDataManager; + + private final Log log = ExoLogger.getLogger(this.getClass().getName()); + /** * Holds session's tokens and their hashes to avoid calculation every time. * Token <--> Hash @@ -105,10 +106,12 @@ * @param session * @param lockTimeOut */ - public SessionLockManager(SessionImpl session, long lockTimeOut) + public SessionLockManager(String sessionID, String userId, SessionDataManager sessionDataManager, long lockTimeOut) { - this.session = session; this.lockTimeOut = lockTimeOut; + this.sessionID = sessionID; + this.userId = userId; + this.sessionDataManager = sessionDataManager; // TODO: configured lock timeout should be acquired from WSconfig /* if (config.getLockManager() != null) { @@ -158,7 +161,7 @@ throw new LockException("Node not locked: " + node.getQPath()); } // if session doesn't have token, null will be returned - return new LockImpl(session, lockData, tokenHash.get(lockData.getTokenHash())); + return new LockImpl(sessionDataManager, lockData, tokenHash.get(lockData.getTokenHash())); } /** @@ -237,21 +240,20 @@ String hash = getHash(token); LockData lockData = - new LockData(node.getIdentifier(), hash, isDeep, isSessionScoped, session.getUserID(), timeOut > 0 ? timeOut - : lockTimeOut); + new LockData(node.getIdentifier(), hash, isDeep, isSessionScoped, userId, timeOut > 0 ? timeOut : lockTimeOut); tokens.put(token, hash); tokenHash.put(hash, token); // Create and pass changes log LockPlainChangesLogImpl changesLog = - new LockPlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.LOCK); + new LockPlainChangesLogImpl(new ArrayList<ItemState>(), sessionID, ExtendedEvent.LOCK); changesLog.setLockData(lockData); PropertyData propData = TransientPropertyData.createPropertyData(node, Constants.JCR_LOCKOWNER, PropertyType.STRING, false, - new TransientValueData(session.getUserID())); + new TransientValueData(userId)); changesLog.add(ItemState.createAddedState(propData)); propData = @@ -259,9 +261,9 @@ new TransientValueData(isDeep)); changesLog.add(ItemState.createAddedState(propData)); - LockImpl newLock = new LockImpl(session, lockData, token); + LockImpl newLock = new LockImpl(sessionDataManager, lockData, token); - session.getTransientNodesManager().getTransactManager().save(changesLog); + sessionDataManager.getTransactManager().save(changesLog); return newLock; } @@ -273,20 +275,17 @@ */ public void unlock(NodeData node) throws RepositoryException { - PlainChangesLog changesLog = - new PlainChangesLogImpl(new ArrayList<ItemState>(), session.getId(), ExtendedEvent.UNLOCK); + PlainChangesLog changesLog = new PlainChangesLogImpl(new ArrayList<ItemState>(), sessionID, ExtendedEvent.UNLOCK); - ItemData lockOwner = - session.getTransientNodesManager().getItemData(node, new QPathEntry(Constants.JCR_LOCKOWNER, 0)); + ItemData lockOwner = sessionDataManager.getItemData(node, new QPathEntry(Constants.JCR_LOCKOWNER, 0)); changesLog.add(ItemState.createDeletedState(lockOwner)); - ItemData lockIsDeep = - session.getTransientNodesManager().getItemData(node, new QPathEntry(Constants.JCR_LOCKISDEEP, 0)); + ItemData lockIsDeep = sessionDataManager.getItemData(node, new QPathEntry(Constants.JCR_LOCKISDEEP, 0)); changesLog.add(ItemState.createDeletedState(lockIsDeep)); - session.getTransientNodesManager().getTransactManager().save(changesLog); + sessionDataManager.getTransactManager().save(changesLog); } /** @@ -330,15 +329,15 @@ { if ((searchType & SEARCH_EXACMATCH) != 0) { - retval = session.getTransientNodesManager().getLockData(data.getIdentifier()); + retval = sessionDataManager.getLockData(data.getIdentifier()); } if (retval == null && (searchType & SEARCH_PARENT) != 0) { - NodeData parentData = (NodeData)session.getTransientNodesManager().getItemData(data.getParentIdentifier()); + NodeData parentData = (NodeData)sessionDataManager.getItemData(data.getParentIdentifier()); if (parentData != null) { - retval = session.getTransientNodesManager().getLockData(parentData.getIdentifier()); + retval = sessionDataManager.getLockData(parentData.getIdentifier()); // parent not found try to find upper if (retval == null) { @@ -349,10 +348,10 @@ if (retval == null && (searchType & SEARCH_CHILD) != 0) { - List<NodeData> childData = session.getTransientNodesManager().getChildNodesData(data); + List<NodeData> childData = sessionDataManager.getChildNodesData(data); for (NodeData nodeData : childData) { - retval = session.getTransientNodesManager().getLockData(nodeData.getIdentifier()); + retval = sessionDataManager.getLockData(nodeData.getIdentifier()); if (retval != null) break; } @@ -384,7 +383,7 @@ */ private boolean isLockHolder(LockData lockData) { - return (SystemIdentity.SYSTEM.equals(session.getId()) || tokenHash.get(lockData.getTokenHash()) != null); + return (SystemIdentity.SYSTEM.equals(sessionID) || tokenHash.get(lockData.getTokenHash()) != null); } /** @@ -392,7 +391,35 @@ */ public void onCloseSession(ExtendedSession session) { - // TODO: remove session scoped locks + // the logic as it was before, if session holds token for lock, and lock is open scoped - remove it. + List<LockData> lockDatas; + try + { + lockDatas = sessionDataManager.getLocksData(); + } + catch (RepositoryException e) + { + // exception getting list of locks, return. + log.error(e.getMessage(), e); + return; + } + // list acquired, traversing to cleanup; + for (LockData lockData : lockDatas) + { + if (lockData.isSessionScoped() && isLockHolder(lockData)) + { + NodeData node; + try + { + node = (NodeData)sessionDataManager.getItemData(lockData.getNodeIdentifier()); + unlock(node); + } + catch (RepositoryException e) + { + log.error("Can't unlock node:" + lockData.getNodeIdentifier(), e); + } + } + } } } Deleted: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java 2009-11-18 11:18:07 UTC (rev 746) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java 2009-11-18 11:28:16 UTC (rev 747) @@ -1,109 +0,0 @@ -/* - * 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. - */ -package org.exoplatform.services.jcr.impl.core.lock; - -import org.exoplatform.services.jcr.JcrImplBaseTest; -import org.exoplatform.services.jcr.core.ExtendedNode; -import org.exoplatform.services.jcr.impl.core.NodeImpl; - -import javax.jcr.RepositoryException; - -/** - * @author <a href="mailto:Sergey.Kabashnyuk@gmail.com">Sergey Kabashnyuk</a> - * @version $Id$ - */ -public class TestLockImpl extends JcrImplBaseTest -{ - private ExtendedNode lockedNode = null; - - private static final long LOCK_TIMEOUT = 5; // sec - - //private static final long LOCK_REMOVER_WAIT = LockRemover.DEFAULT_THREAD_TIMEOUT + (LOCK_TIMEOUT + 1) * 1000; // 15 - private static final long LOCK_REMOVER_WAIT = (LOCK_TIMEOUT + 30) * 1000; // - - // sec - - public void setUp() throws Exception - { - - super.setUp(); - - if (lockedNode == null) - try - { - lockedNode = (ExtendedNode)root.addNode("locked node"); - if (lockedNode.canAddMixin("mix:lockable")) - lockedNode.addMixin("mix:lockable"); - root.save(); - } - catch (RepositoryException e) - { - fail("Child node must be accessible and readable. But error occurs: " + e); - } - } - - public void testNonSessionScopedLockRemoveOnTimeOut() - { - try - { - LockImpl lock = (LockImpl)lockedNode.lock(true, false); - - assertTrue(lockedNode.isLocked()); - lock.setTimeOut(LOCK_TIMEOUT);// 5 sec - if (log.isDebugEnabled()) - log.debug("Stoping thread. Wait for removing lock for node " - + ((NodeImpl)lockedNode).getData().getIdentifier() + "by LockRemover"); - Thread.sleep(LOCK_REMOVER_WAIT); - assertFalse(lockedNode.isLocked()); - - } - catch (RepositoryException e) - { - fail(e.getLocalizedMessage()); - } - catch (InterruptedException e) - { - fail(e.getLocalizedMessage()); - } - } - - public void testSessionScopedLockRemoveOnTimeOut() - { - try - { - LockImpl lock = (LockImpl)lockedNode.lock(true, true); - assertTrue(lockedNode.isLocked()); - lock.setTimeOut(LOCK_TIMEOUT); // sec - if (log.isDebugEnabled()) - log.debug("Stoping thread. Wait for removing lock by LockRemover"); - Thread.sleep(LOCK_REMOVER_WAIT); - assertTrue(lockedNode.isLocked()); - lockedNode.unlock(); - } - catch (RepositoryException e) - { - fail(e.getLocalizedMessage()); - } - catch (InterruptedException e) - { - fail(e.getLocalizedMessage()); - } - } - -}

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r746 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2009-11-18 06:18:07 -0500 (Wed, 18 Nov 2009) New Revision: 746 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java Log: EXOJCR-249 : The method exists(Fqn name) was changed in JDBCCacheLoader. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-18 10:40:33 UTC (rev 745) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoader.java 2009-11-18 11:18:07 UTC (rev 746) @@ -386,14 +386,100 @@ public boolean exists(Fqn name) throws Exception { // TODO Will be created specialization code to checking exist node or property in DB without getting NodeData or PropertyData from DB. + JDBCStorageConnection conn = (JDBCStorageConnection) dataContainer.openConnection(); + + boolean exists; + try { - return get(name) != null; + if (name.size() > 1) + { + if (name.get(0).equals(JBossCacheStorage.NODES)) + { + // /$NODES/<NODE_ID> + if (name.size() == 2) + { + String nodeId = name.getLastElementAsString(); + String nodeName = "" /* = conn.getNodeName(nodeId)*/; + + if (nodeName != null) + { + exists = true; + } + else + { + exists = false; + } + } + // /$NODES/<NODE_ID>/<SUB_NODE_NAME> + else if (name.size() == 3) + { + QPathEntry childNodeName = QPathEntry.parse(name.getLastElementAsString()); + String parentId = (String)name.get(1); + + String nodeId = "" /* = conn.getIdentifier(parentId, childNodeName)*/; + if (nodeId != null) + { + exists = true; + } + else + { + exists = false; + } + } + else + { + exists = false; + LOG.warn("Unexpected Fqn asked " + name); + } + } + // /$PROPS/<PROPERTY_ID> + else if (name.get(0).equals(JBossCacheStorage.PROPS)) + { + if (name.size() == 2) + { + String propertyId = name.getLastElementAsString(); + String propertyName = "" /* = conn.getPropertyName(nodeId)*/; + + if (propertyName != null) + { + exists = true; + } + else + { + exists = false; + } + } + else + { + exists = false; + LOG.warn("Unexpected Fqn asked " + name); + } + } + else + { + exists = false; + LOG.warn("Unexpected Fqn asked " + name); + } + } + else if (name.equals(Fqn.ROOT) || name.equals(JBossCacheStorage.PROPS) || name.equals(JBossCacheStorage.NODES) + || name.equals(JBossCacheStorage.LOCKS)) + { + // roots, like NODES, PROPS etc + exists = true; + } + else + { + exists = false; + LOG.warn("Unexpected Fqn asked " + name); + } } - catch (JDBCCacheLoaderException e) + finally { - return false; + conn.close(); } + + return exists; } /**

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r745 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2009-11-18 05:40:33 -0500 (Wed, 18 Nov 2009) New Revision: 745 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java Log: EXOJCR-242:JbossCache WorkspaceDataManager updated to handle changes logs of ExtendedEvent.LOCK an UNLOCK types. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 10:36:41 UTC (rev 744) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 10:40:33 UTC (rev 745) @@ -22,13 +22,16 @@ import org.exoplatform.services.jcr.dataflow.CompositeChangesLog; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; +import org.exoplatform.services.jcr.dataflow.LockPlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; import org.exoplatform.services.jcr.dataflow.ReadOnlyThroughChanges; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.impl.Constants; +import org.exoplatform.services.jcr.impl.core.lock.LockData; import org.exoplatform.services.jcr.impl.dataflow.TransientItemData; import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder; +import org.exoplatform.services.jcr.observation.ExtendedEvent; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; @@ -93,6 +96,43 @@ { for (PlainChangesLog curChangesLog : chengesLogList) { + // if this is LOCK or UNLOCK changes log, then put or remove lock data from cache + if (curChangesLog.getEventType() == ExtendedEvent.LOCK + || curChangesLog.getEventType() == ExtendedEvent.UNLOCK) + { + WorkspaceStorageConnection conn = thisConnection == null + // we need this container connection + ? thisConnection = (systemDataContainer != dataContainer + // if it's different container instances + ? dataContainer.equals(systemDataContainer) && systemConnection != null + // but container configurations are same and system connection open + // reuse system connection as this + ? dataContainer.reuseConnection(systemConnection) + // or open one new + : dataContainer.openConnection() + // else if it's same container instances (system and this) + : systemConnection == null + // and system connection doens't exist - open it + ? systemConnection = dataContainer.openConnection() + // if already open - use it + : systemConnection) + // this connection opened - use it + : thisConnection; + + switch (curChangesLog.getEventType()) + { + case ExtendedEvent.LOCK : + // put lock data to cache + LockData lockData = ((LockPlainChangesLogImpl)curChangesLog).getLockData(); + conn.addLockData(lockData); + break; + case ExtendedEvent.UNLOCK : + // remove lock data from cache + conn.removeLockData(curChangesLog.getAllStates().get(0).getData().getParentIdentifier()); + break; + } + } + for (Iterator<ItemState> iter = curChangesLog.getAllStates().iterator(); iter.hasNext();) { ItemState itemState = iter.next();

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r744 - in jcr/trunk: applications/java/exo.jcr.applications.backupconsole and 12 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 05:36:41 -0500 (Wed, 18 Nov 2009) New Revision: 744 Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml jcr/trunk/applications/java/exo.jcr.ear/pom.xml jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.ext/pom.xml jcr/trunk/exo.jcr.component.ftp/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/exo.jcr.framework.ftpclient/pom.xml jcr/trunk/exo.jcr.framework.web/pom.xml jcr/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.backupconsole/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -39,26 +39,30 @@ <dependencies> <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.commons</artifactId> </dependency> - <dependency> - <groupId>org.apache.ws.commons</groupId> - <artifactId>ws-commons-util</artifactId> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.browser/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -34,19 +34,46 @@ <name>eXo JCR :: Application :: Browser Demo</name> <dependencies> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.fckeditor/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,19 +35,16 @@ <description>eXo simple CMS web app</description> <dependencies> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <scope>provided</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.applications.rest/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,13 +35,11 @@ <description>eXo JCR Rest web application</description> <dependencies> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>provided</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/applications/java/exo.jcr.ear/pom.xml =================================================================== --- jcr/trunk/applications/java/exo.jcr.ear/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/applications/java/exo.jcr.ear/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -40,28 +40,24 @@ <type>rar</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.rest</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.browser</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.applications.fckeditor</artifactId> <type>war</type> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -43,72 +43,54 @@ <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> </dependency> - -  <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.command</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> - -  - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.api</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.document</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.security.core</artifactId> </dependency> - -  - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> </dependency> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </dependency> - - <dependency> <groupId>com.sun.xml.stream</groupId> <artifactId>sjsxp</artifactId> </dependency> - <dependency> <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> @@ -119,40 +101,51 @@ </exclusion> </exclusions> </dependency> - -  - -  - <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> </dependency> - <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> - <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - - <dependency> <groupId>org.apache.ws.commons</groupId> <artifactId>ws-commons-util</artifactId> <exclusions> @@ -166,7 +159,6 @@ </exclusion> </exclusions> </dependency> -  <dependency> <groupId>org.apache.jackrabbit</groupId> @@ -184,15 +176,12 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> -  - <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> -  <dependency> <groupId>mysql</groupId> @@ -200,7 +189,6 @@ <version>5.0.5</version> <scope>test</scope> </dependency> -  <dependency> <groupId>postgresql</groupId> @@ -208,7 +196,6 @@ <version>8.2-504.jdbc3</version> <scope>test</scope> </dependency> -   -   -  <dependency> <groupId>net.sourceforge.jtds</groupId> @@ -244,7 +229,6 @@ <version>1.2</version> <scope>test</scope> </dependency> -   -  <dependency> <groupId>org.apache.derby</groupId> @@ -260,7 +243,6 @@ <version>10.2.2.0</version> <scope>test</scope> </dependency> -   -   -   -  </dependencies> Modified: jcr/trunk/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ext/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.ext/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,6 +35,30 @@ <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.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <exclusions> @@ -61,6 +85,22 @@ <artifactId>exo.ws.commons</artifactId> </dependency> <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </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> @@ -77,6 +117,18 @@ <artifactId>commons-fileupload</artifactId> </dependency> <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> Modified: jcr/trunk/exo.jcr.component.ftp/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.ftp/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.ftp/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,24 +38,53 @@ </properties> <dependencies> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.command</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.webdav/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,6 +35,18 @@ <dependencies> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.rest.core</artifactId> </dependency> @@ -55,6 +67,30 @@ <artifactId>exo.jcr.component.core</artifactId> </dependency> <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <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> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> @@ -72,7 +108,6 @@ </includes> <excludes> <exclude>**/TestUtils.java</exclude> - <exclude>**/TestUtils.java</exclude>  <exclude>**/TestEncoding.java</exclude> <exclude>**/TestPropFindContent.java</exclude> Modified: jcr/trunk/exo.jcr.connectors.localadapter/pom.xml =================================================================== --- jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.connectors.localadapter/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -50,72 +50,70 @@ </exclusions> <scope>runtime</scope> </dependency> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ftp</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.command</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.ftpclient</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.framework.web</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.frameworks.servlet</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <scope>runtime</scope> </dependency> - <dependency> <groupId>javax.resource</groupId> <artifactId>connector</artifactId> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> </dependency> - <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> <exclusions> Modified: jcr/trunk/exo.jcr.framework.command/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.command/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.command/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -34,39 +34,65 @@ <description>eXo JCR command framework</description> <dependencies> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.command</artifactId> </dependency> - <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> - <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> - <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + </dependency> + <dependency> + <groupId>commons-chain</groupId> + <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>hsqldb</groupId> <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.framework.ftpclient/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.ftpclient/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,12 +38,10 @@ </properties> <dependencies> - <dependency> <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> + <artifactId>exo.kernel.commons</artifactId> </dependency> - </dependencies> <build> Modified: jcr/trunk/exo.jcr.framework.web/pom.xml =================================================================== --- jcr/trunk/exo.jcr.framework.web/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/exo.jcr.framework.web/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -35,7 +35,19 @@ <dependencies> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ext</artifactId> </dependency> <dependency> @@ -48,15 +60,23 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <scope>provided</scope> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + </dependency> </dependencies> <build> Modified: jcr/trunk/pom.xml =================================================================== --- jcr/trunk/pom.xml 2009-11-18 10:06:51 UTC (rev 743) +++ jcr/trunk/pom.xml 2009-11-18 10:36:41 UTC (rev 744) @@ -38,9 +38,9 @@ <properties> <exo.product.name>exo-jcr</exo.product.name> <exo.product.specification>1.12</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta03</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.0-Beta03</org.exoplatform.ws.version> + <org.exoplatform.kernel.version>2.2.0-Beta04-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta04-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.0-Beta04-SNAPSHOT</org.exoplatform.ws.version> </properties> <scm> @@ -72,253 +72,313 @@ </modules> <dependencyManagement> - <dependencies> - + <dependencies> <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.fckeditor</artifactId> - <version>${project.version}</version> - <type>war</type> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.browser</artifactId> - <version>${project.version}</version> - <type>war</type> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> </dependency> - <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.script.groovy</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.ext</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.commons</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.json</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.applications.rest</artifactId> + <artifactId>exo.jcr.component.ext</artifactId> <version>${project.version}</version> - <type>war</type> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.core</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> + <artifactId>exo.jcr.framework.command</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.ftp</artifactId> <version>${project.version}</version> - </dependency> - + </dependency> <dependency> <groupId>org.exoplatform.jcr</groupId> <artifactId>exo.jcr.component.webdav</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.command</artifactId> + <artifactId>exo.jcr.framework.web</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.web</artifactId> + <artifactId>exo.jcr.framework.ftpclient</artifactId> <version>${project.version}</version> </dependency> - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.framework.ftpclient</artifactId> + <artifactId>exo.jcr.applications.fckeditor</artifactId> <version>${project.version}</version> + <type>war</type> </dependency> - - <dependency> <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.connectors.localadapter</artifactId> - <type>rar</type> + <artifactId>exo.jcr.applications.browser</artifactId> <version>${project.version}</version> + <type>war</type> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.applications.rest</artifactId> + <version>${project.version}</version> + <type>war</type> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.connectors.localadapter</artifactId> + <type>rar</type> + <version>${project.version}</version> + </dependency> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> + <groupId>commons-chain</groupId> + <artifactId>commons-chain</artifactId> + <version>1.0</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.jibx</groupId> + <artifactId>jibx-run</artifactId> + <version>1.2.1</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.0.b2</version> </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.script.groovy</artifactId> - <version>${org.exoplatform.core.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.5.6</version> </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> - <version>${org.exoplatform.ws.version}</version> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <version>1.0</version> </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.ext</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> - - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> <version>1.0</version> </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> <version>1.0</version> </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-tests</artifactId> - <version>1.6.0</version> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> </dependency> - -  <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.6</version> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> <version>2.4.1</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-spellchecker</artifactId> <version>2.4.1</version> </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-memory</artifactId> <version>2.4.1</version> - </dependency> - + </dependency> <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - - <dependency> <groupId>com.sun.xml.stream</groupId> <artifactId>sjsxp</artifactId> <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> </dependency> - <dependency> + <groupId>concurrent</groupId> + <artifactId>concurrent</artifactId> + <version>1.3.4</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.apache.ws.commons</groupId> + <artifactId>ws-commons-util</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-tests</artifactId> + <version>1.6.0</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.5.6</version> + </dependency> + <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>1.8.0.7</version> </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.10.GA</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> <version>1.2.1</version> </dependency> - <dependency> - <groupId>jotm</groupId> - <artifactId>jotm</artifactId> - <version>2.0.10</version> - <exclusions> - <exclusion> - <groupId>javax.resource</groupId> - <artifactId>connector</artifactId> - </exclusion> - </exclusions> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.1.7</version> </dependency> - <dependency> <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> + <artifactId>connector</artifactId> <version>1.5</version> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3</version> + </dependency> + + + </dependencies> </dependencyManagement>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r743 - jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent.

by do-not-reply＠jboss.org

Author: tolusha Date: 2009-11-18 05:06:51 -0500 (Wed, 18 Nov 2009) New Revision: 743 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java Log: EXOJCR-201: prepare changes log list Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 09:19:29 UTC (rev 742) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java 2009-11-18 10:06:51 UTC (rev 743) @@ -18,9 +18,13 @@ */ package org.exoplatform.services.jcr.impl.dataflow.persistent; +import org.exoplatform.services.jcr.dataflow.ChangesLogIterator; +import org.exoplatform.services.jcr.dataflow.CompositeChangesLog; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; +import org.exoplatform.services.jcr.dataflow.PlainChangesLog; import org.exoplatform.services.jcr.dataflow.ReadOnlyThroughChanges; +import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; import org.exoplatform.services.jcr.datamodel.QPath; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.dataflow.TransientItemData; @@ -28,8 +32,10 @@ import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; +import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Set; import javax.jcr.RepositoryException; @@ -69,85 +75,102 @@ WorkspaceStorageConnection thisConnection = null; WorkspaceStorageConnection systemConnection = null; + // prepare changes log list + List<PlainChangesLog> chengesLogList = new ArrayList<PlainChangesLog>(); + if (changesLog instanceof PlainChangesLog) + { + chengesLogList.add((PlainChangesLog)changesLog); + } + else if (changesLog instanceof CompositeChangesLog) + { + for (ChangesLogIterator iter = ((CompositeChangesLog)changesLog).getLogIterator(); iter.hasNextLog();) + { + chengesLogList.add(iter.nextLog()); + } + } + try { - for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();) + for (PlainChangesLog curChangesLog : chengesLogList) { - ItemState itemState = iter.next(); + for (Iterator<ItemState> iter = curChangesLog.getAllStates().iterator(); iter.hasNext();) + { + ItemState itemState = iter.next(); - if (!itemState.isPersisted()) - continue; + if (!itemState.isPersisted()) + continue; - long start = System.currentTimeMillis(); + long start = System.currentTimeMillis(); - TransientItemData data = (TransientItemData)itemState.getData(); + TransientItemData data = (TransientItemData)itemState.getData(); - WorkspaceStorageConnection conn = null; - if (isSystemDescendant(data.getQPath())) - { - conn = systemConnection == null - // we need system connection but it's not exist - ? systemConnection = (systemDataContainer != dataContainer - // if it's different container instances - ? systemDataContainer.equals(dataContainer) && thisConnection != null - // but container confugrations are same and non-system connnection open - // reuse this connection as system - ? systemDataContainer.reuseConnection(thisConnection) - // or open one new system - : systemDataContainer.openConnection() - // else if it's same container instances (system and this) - : thisConnection == null - // and non-system connection doens't exist - open it - ? thisConnection = dataContainer.openConnection() - // if already open - use it - : thisConnection) - // system connection opened - use it - : systemConnection; - } - else - { - conn = thisConnection == null - // we need this conatiner conection - ? thisConnection = (systemDataContainer != dataContainer - // if it's different container instances - ? dataContainer.equals(systemDataContainer) && systemConnection != null - // but container confugrations are same and system connnection open - // reuse system connection as this - ? dataContainer.reuseConnection(systemConnection) - // or open one new - : dataContainer.openConnection() - // else if it's same container instances (system and this) - : systemConnection == null - // and system connection doens't exist - open it - ? systemConnection = dataContainer.openConnection() - // if already open - use it - : systemConnection) - // this connection opened - use it - : thisConnection; - } + WorkspaceStorageConnection conn = null; + if (isSystemDescendant(data.getQPath())) + { + conn = systemConnection == null + // we need system connection but it's not exist + ? systemConnection = (systemDataContainer != dataContainer + // if it's different container instances + ? systemDataContainer.equals(dataContainer) && thisConnection != null + // but container confugrations are same and non-system connnection open + // reuse this connection as system + ? systemDataContainer.reuseConnection(thisConnection) + // or open one new system + : systemDataContainer.openConnection() + // else if it's same container instances (system and this) + : thisConnection == null + // and non-system connection doens't exist - open it + ? thisConnection = dataContainer.openConnection() + // if already open - use it + : thisConnection) + // system connection opened - use it + : systemConnection; + } + else + { + conn = thisConnection == null + // we need this conatiner conection + ? thisConnection = (systemDataContainer != dataContainer + // if it's different container instances + ? dataContainer.equals(systemDataContainer) && systemConnection != null + // but container confugrations are same and system connnection open + // reuse system connection as this + ? dataContainer.reuseConnection(systemConnection) + // or open one new + : dataContainer.openConnection() + // else if it's same container instances (system and this) + : systemConnection == null + // and system connection doens't exist - open it + ? systemConnection = dataContainer.openConnection() + // if already open - use it + : systemConnection) + // this connection opened - use it + : thisConnection; + } - data.increasePersistedVersion(); + data.increasePersistedVersion(); - if (itemState.isAdded()) - { - doAdd(data, conn, addedNodes); + if (itemState.isAdded()) + { + doAdd(data, conn, addedNodes); + } + else if (itemState.isUpdated()) + { + doUpdate(data, conn); + } + else if (itemState.isDeleted()) + { + doDelete(data, conn); + } + else if (itemState.isRenamed()) + { + doRename(data, conn, addedNodes); + } + + if (LOG.isDebugEnabled()) + LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start) + + "ms, " + data.getQPath().getAsString()); } - else if (itemState.isUpdated()) - { - doUpdate(data, conn); - } - else if (itemState.isDeleted()) - { - doDelete(data, conn); - } - else if (itemState.isRenamed()) - { - doRename(data, conn, addedNodes); - } - - if (LOG.isDebugEnabled()) - LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start) - + "ms, " + data.getQPath().getAsString()); } if (thisConnection != null) thisConnection.commit();

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r742 - in ws/trunk: exo.ws.commons and 1 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 04:19:29 -0500 (Wed, 18 Nov 2009) New Revision: 742 Modified: ws/trunk/exo.ws.commons/pom.xml ws/trunk/exo.ws.frameworks.servlet/pom.xml ws/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: ws/trunk/exo.ws.commons/pom.xml =================================================================== --- ws/trunk/exo.ws.commons/pom.xml 2009-11-18 09:12:07 UTC (rev 741) +++ ws/trunk/exo.ws.commons/pom.xml 2009-11-18 09:19:29 UTC (rev 742) @@ -37,17 +37,14 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons</artifactId> </dependency> - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> </dependency> - </dependencies> </project> Modified: ws/trunk/exo.ws.frameworks.servlet/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-18 09:12:07 UTC (rev 741) +++ ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-18 09:19:29 UTC (rev 742) @@ -49,6 +49,5 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> </dependency> - </dependencies> </project> Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2009-11-18 09:12:07 UTC (rev 741) +++ ws/trunk/pom.xml 2009-11-18 09:19:29 UTC (rev 742) @@ -103,9 +103,6 @@ <artifactId>exo.ws.rest.core</artifactId> <version>${project.version}</version> </dependency> - - - <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r741 - in ws/trunk: exo.ws.commons and 4 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 04:12:07 -0500 (Wed, 18 Nov 2009) New Revision: 741 Modified: ws/trunk/exo.ws.commons/pom.xml ws/trunk/exo.ws.frameworks.json/pom.xml ws/trunk/exo.ws.frameworks.servlet/pom.xml ws/trunk/exo.ws.rest.core/pom.xml ws/trunk/exo.ws.rest.ext/pom.xml ws/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: ws/trunk/exo.ws.commons/pom.xml =================================================================== --- ws/trunk/exo.ws.commons/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/exo.ws.commons/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -35,15 +35,19 @@ <dependencies> <dependency> <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> + <artifactId>exo.kernel.commons</artifactId> </dependency> + <dependency> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> </dependency> + <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> + </dependencies> </project> Modified: ws/trunk/exo.ws.frameworks.json/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.json/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/exo.ws.frameworks.json/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -35,8 +35,9 @@ <dependencies> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> Modified: ws/trunk/exo.ws.frameworks.servlet/pom.xml =================================================================== --- ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/exo.ws.frameworks.servlet/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -41,5 +41,14 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + </dependencies> </project> Modified: ws/trunk/exo.ws.rest.core/pom.xml =================================================================== --- ws/trunk/exo.ws.rest.core/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/exo.ws.rest.core/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -35,11 +35,11 @@ <dependencies> <dependency> <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> + <artifactId>exo.kernel.commons</artifactId> </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.xml-processing</artifactId> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> </dependency> <dependency> <groupId>org.exoplatform.ws</groupId> @@ -49,16 +49,45 @@ <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.testframework</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> </dependency> <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> <scope>test</scope> @@ -71,10 +100,6 @@ <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> </dependencies> <build> Modified: ws/trunk/exo.ws.rest.ext/pom.xml =================================================================== --- ws/trunk/exo.ws.rest.ext/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/exo.ws.rest.ext/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -34,6 +34,18 @@ <dependencies> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.commons</artifactId> </dependency> @@ -45,5 +57,26 @@ <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + <dependency> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </dependency> </dependencies> </project> Modified: ws/trunk/pom.xml =================================================================== --- ws/trunk/pom.xml 2009-11-18 09:09:44 UTC (rev 740) +++ ws/trunk/pom.xml 2009-11-18 09:12:07 UTC (rev 741) @@ -45,8 +45,8 @@ <exo.product.name>exo-ws</exo.product.name> <exo.product.specification>2.1</exo.product.specification> - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.0-Beta03</org.exoplatform.core.version> + <org.exoplatform.kernel.version>2.2.0-Beta04-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.0-Beta04-SNAPSHOT</org.exoplatform.core.version> <exo.test.includes>*Test*</exo.test.includes> </properties> @@ -62,89 +62,112 @@ </modules> <dependencyManagement> - <dependencies> + <dependencies> <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.xml-processing</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.frameworks.json</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.commons</artifactId> + <artifactId>exo.ws.testframework</artifactId> <version>${project.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.rest.core</artifactId> + <artifactId>exo.ws.commons</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.testframework</artifactId> + <artifactId>exo.ws.rest.core</artifactId> <version>${project.version}</version> - </dependency> + </dependency> + + + + <dependency> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0</version> + </dependency> <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.xml-processing</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + </dependency> <dependency> - <groupId>com.sun.xml.stream</groupId> - <artifactId>sjsxp</artifactId> - <version>1.0</version> - </dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.7</version> - </dependency> - <dependency> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.1</version> - </dependency> + </dependency> + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> <dependency> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> <version>0.4</version> - </dependency> + </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId>  <version>1.0</version> - </dependency> + </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>1.0</version> + </dependency> <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> <version>1.0</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> + </dependency> + <dependency> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> + </dependency> + </dependencies> </dependencyManagement> </project>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r740 - in core/trunk: exo.core.component.ldap and 5 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 04:09:44 -0500 (Wed, 18 Nov 2009) New Revision: 740 Modified: core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.document/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -34,10 +34,6 @@ <description>eXo demo service Impl</description> <dependencies> - - - - <dependency> <groupId>org.exoplatform.tool</groupId> <artifactId>exo.tool.framework.junit</artifactId> Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -34,27 +34,22 @@ <description>eXo LDAP impl</description> <dependencies> - <dependency> <groupId>org.exoplatform.tool</groupId> <artifactId>exo.tool.framework.junit</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> - <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>com.novell.ldap</groupId> <artifactId>jldap</artifactId> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.organization.api/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -38,47 +38,38 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.container</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.commons</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.security.core</artifactId> </dependency> - <dependency> <groupId>xdoclet</groupId> <artifactId>xdoclet-hibernate-module</artifactId> </dependency> - <dependency> <groupId>xdoclet</groupId> <artifactId>xdoclet-xdoclet-module</artifactId> </dependency> - <dependency> <groupId>xdoclet</groupId> <artifactId>xjavadoc</artifactId> </dependency> - <dependency> <groupId>xstream</groupId> <artifactId>xstream</artifactId> </dependency> - <dependency> <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId> </dependency> - </dependencies> <build> Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -34,93 +34,76 @@ <description>eXo Organization Service JDBC</description> <dependencies> - <dependency> <groupId>org.exoplatform.tool</groupId> <artifactId>exo.tool.framework.junit</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.cache</artifactId> </dependency> - <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>xstream</groupId> <artifactId>xstream</artifactId> </dependency> - <dependency> <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId> </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.database</artifactId> </dependency> - <dependency> <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.api</artifactId> </dependency> - <dependency> <groupId>javax.resource</groupId> <artifactId>connector-api</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>com.microsoft</groupId> <artifactId>sqljdbc</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>com.ibm.db2</groupId> <artifactId>db2jcc</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>com.ibm.db2</groupId> <artifactId>db2jcc_license_cu</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>oracle</groupId> <artifactId>ojdbc</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.security.core/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -38,27 +38,22 @@ <groupId>org.exoplatform.kernel</groupId> <artifactId>exo.kernel.component.common</artifactId> </dependency> - <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>javax.servlet</groupId> <artifactId>servlet-api</artifactId> </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> - </dependencies> <build> Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.web.css/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -38,16 +38,13 @@ <groupId>org.w3c</groupId> <artifactId>sac</artifactId> </dependency> - <dependency> <groupId>batik</groupId> <artifactId>batik-util</artifactId> </dependency> - <dependency> <groupId>batik</groupId> <artifactId>batik-css</artifactId> </dependency> - </dependencies> </project> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-18 09:01:34 UTC (rev 739) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-18 09:09:44 UTC (rev 740) @@ -38,17 +38,14 @@ <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>jtidy</groupId> <artifactId>jtidy</artifactId> </dependency> - <dependency> <groupId>picocontainer</groupId> <artifactId>picocontainer</artifactId>

16 years, 8 months

1
0
0 / 0

exo-jcr SVN: r739 - in core/trunk: exo.core.component.database and 10 other directories.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2009-11-18 04:01:34 -0500 (Wed, 18 Nov 2009) New Revision: 739 Modified: core/trunk/exo.core.component.database/pom.xml core/trunk/exo.core.component.document/pom.xml core/trunk/exo.core.component.ldap/pom.xml core/trunk/exo.core.component.organization.api/pom.xml core/trunk/exo.core.component.organization.jdbc/pom.xml core/trunk/exo.core.component.organization.ldap/pom.xml core/trunk/exo.core.component.script.groovy/pom.xml core/trunk/exo.core.component.security.core/pom.xml core/trunk/exo.core.component.web.css/pom.xml core/trunk/exo.core.component.xml-processing/pom.xml core/trunk/packaging/module/pom.xml core/trunk/pom.xml Log: EXOJCR-162 Modules dependencies cleaned Modified: core/trunk/exo.core.component.database/pom.xml =================================================================== --- core/trunk/exo.core.component.database/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.database/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,146 +1,116 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.database</artifactId> - - <name>eXo Core :: Component :: Database Service</name> - <description>exoplatform database services implementation</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - </dependency> - - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/DBCreatorTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.database</artifactId> + + <name>eXo Core :: Component :: Database Service</name> + <description>exoplatform database services implementation</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + <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.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + <dependency> + <groupId>pull-parser</groupId> + <artifactId>pull-parser</artifactId> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/DBCreatorTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Modified: core/trunk/exo.core.component.document/pom.xml =================================================================== --- core/trunk/exo.core.component.document/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.document/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,104 +1,112 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.document</artifactId> - - <name>eXo Core :: Component :: Demo Service</name> - <description>eXo demo service Impl</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>pdfbox</groupId> - <artifactId>pdfbox</artifactId> - </dependency> - - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - </dependency> - - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.drl</include> - <include>**/*.vm</include> - <include>**/*.doc</include> - <include>**/*.dot</include> - <include>**/*.xls</include> - <include>**/*.ppt</include> - <include>**/*.txt</include> - <include>**/*.tiff</include> - <include>**/*.pdf</include> - <include>**/*.odt</include> - <include>**/*.html</include> - <include>**/*.msg</include> - <include>**/*.pst</include> - </includes> - </testResource> - </testResources> - </build> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.document</artifactId> + + <name>eXo Core :: Component :: Demo Service</name> + <description>eXo demo service Impl</description> + + <dependencies> + + + + + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + <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>pdfbox</groupId> + <artifactId>pdfbox</artifactId> + </dependency> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.drl</include> + <include>**/*.vm</include> + <include>**/*.doc</include> + <include>**/*.dot</include> + <include>**/*.xls</include> + <include>**/*.ppt</include> + <include>**/*.txt</include> + <include>**/*.tiff</include> + <include>**/*.pdf</include> + <include>**/*.odt</include> + <include>**/*.html</include> + <include>**/*.msg</include> + <include>**/*.pst</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.ldap/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.ldap/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,66 +1,82 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.ldap</artifactId> - - <name>eXo Core :: Component :: LDAP Service</name> - <description>eXo LDAP impl</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>com.novell.ldap</groupId> - <artifactId>jldap</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/TestLDAPService.java</exclude> - <exclude>**/TestNovellLDAPAPI.java</exclude> - <exclude>**/TestStandardLDAPAPI.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.ldap</artifactId> + + <name>eXo Core :: Component :: LDAP Service</name> + <description>eXo LDAP impl</description> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + + <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>com.novell.ldap</groupId> + <artifactId>jldap</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/TestLDAPService.java</exclude> + <exclude>**/TestNovellLDAPAPI.java</exclude> + <exclude>**/TestStandardLDAPAPI.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Modified: core/trunk/exo.core.component.organization.api/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.api/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.organization.api/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,133 +1,133 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.api</artifactId> - - <name>eXo Core :: Component :: Organization Service API</name> - <description>eXo Organization Service API</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - </dependency> - - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - </dependency> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/login.conf</include> - </includes> - </testResource> - </testResources> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>compile</phase> - <configuration> - <tasks> - <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" /> - <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false"> - <fileset dir="${basedir}/src/main/java"> - <include name="org/exoplatform/services/organization/impl/UserImpl.java" /> - <include name="org/exoplatform/services/organization/impl/MembershipImpl.java" /> - <include name="org/exoplatform/services/organization/impl/GroupImpl.java" /> - <include name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" /> - <include name="org/exoplatform/services/organization/impl/UserProfileData.java" /> - </fileset> - <hibernate version="3.0" /> - </hibernatedoclet> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.organization.api</artifactId> + + <name>eXo Core :: Component :: Organization Service API</name> + <description>eXo Organization Service API</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-hibernate-module</artifactId> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-xdoclet-module</artifactId> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + </dependency> + + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> + + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/login.conf</include> + </includes> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>compile</phase> + <configuration> + <tasks> + <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" /> + <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false"> + <fileset dir="${basedir}/src/main/java"> + <include name="org/exoplatform/services/organization/impl/UserImpl.java" /> + <include name="org/exoplatform/services/organization/impl/MembershipImpl.java" /> + <include name="org/exoplatform/services/organization/impl/GroupImpl.java" /> + <include name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" /> + <include name="org/exoplatform/services/organization/impl/UserProfileData.java" /> + </fileset> + <hibernate version="3.0" /> + </hibernatedoclet> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,89 +1,130 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.jdbc</artifactId> - - <name>eXo Core :: Component :: Organization Service JDBC</name> - <description>eXo Organization Service JDBC</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>oracle</groupId> - <artifactId>ojdbc</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.organization.jdbc</artifactId> + + <name>eXo Core :: Component :: Organization Service JDBC</name> + <description>eXo Organization Service JDBC</description> + + <dependencies> + + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + + <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>xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> + + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.microsoft</groupId> + <artifactId>sqljdbc</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>oracle</groupId> + <artifactId>ojdbc</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.organization.ldap/pom.xml =================================================================== --- core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.organization.ldap/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,66 +1,83 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.organization.ldap</artifactId> - - <name>eXo Core :: Component :: Organization Service LDAP</name> - <description>eXo Organization Service LDAP</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - </dependency> - </dependencies> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/TestOrganizationService.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.organization.ldap</artifactId> + + <name>eXo Core :: Component :: Organization Service LDAP</name> + <description>eXo Organization Service LDAP</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + </dependency> + <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.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/TestOrganizationService.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.script.groovy/pom.xml =================================================================== --- core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.script.groovy/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,46 +1,50 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.script.groovy</artifactId> - - <name>eXo Core :: Component :: Groovy Scripts Instantiator</name> - <description>Load and compile Groovy script</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - </dependency> - </dependencies> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.script.groovy</artifactId> + + <name>eXo Core :: Component :: Groovy Scripts Instantiator</name> + <description>Load and compile Groovy script</description> + + <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.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + </dependencies> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.security.core/pom.xml =================================================================== --- core/trunk/exo.core.component.security.core/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.security.core/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,62 +1,83 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.security.core</artifactId> - - <name>eXo Core :: Component :: Security Service</name> - <description>eXo Security</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/login.conf</include> - </includes> - </testResource> - </testResources> - </build> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.security.core</artifactId> + + <name>eXo Core :: Component :: Security Service</name> + <description>eXo Security</description> + + <dependencies> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + </dependency> + + <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>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/login.conf</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/exo.core.component.web.css/pom.xml =================================================================== --- core/trunk/exo.core.component.web.css/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.web.css/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,53 +1,53 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.web.css</artifactId> - - <name>eXo Core :: Component :: Web CSS</name> - <description>Stylesheet engine</description> - - <dependencies> - <dependency> - <groupId>org.w3c</groupId> - <artifactId>sac</artifactId> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-util</artifactId> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-css</artifactId> - </dependency> - - </dependencies> -</project> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.web.css</artifactId> + + <name>eXo Core :: Component :: Web CSS</name> + <description>Stylesheet engine</description> + + <dependencies> + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + </dependency> + + </dependencies> +</project> Modified: core/trunk/exo.core.component.xml-processing/pom.xml =================================================================== --- core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/exo.core.component.xml-processing/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,103 +1,108 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <artifactId>exo.core.component.xml-processing</artifactId> - - <name>eXo Core :: Component :: XML Processing Service</name> - <description>eXo XML Processing Services</description> - - <dependencies> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - </dependency> - - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - </dependency> - - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.ent</include> - <include>**/*.dtd</include> - <include>**/*.xsd</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xsl</include> - <include>**/*.ent</include> - <include>**/*.dtd</include> - <include>**/*.xsd</include> - </includes> - </resource> - - </resources> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xhtml</include> - <include>**/*.html</include> - <include>**/*.xsl</include> - </includes> - </testResource> - <testResource> - <directory>src/test/java</directory> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - <include>**/*.xhtml</include> - <include>**/*.html</include> - <include>**/*.xsl</include> - </includes> - </testResource> - </testResources> - </build> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <artifactId>exo.core.component.xml-processing</artifactId> + + <name>eXo Core :: Component :: XML Processing Service</name> + <description>eXo XML Processing Services</description> + + <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>jtidy</groupId> + <artifactId>jtidy</artifactId> + </dependency> + + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.ent</include> + <include>**/*.dtd</include> + <include>**/*.xsd</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xsl</include> + <include>**/*.ent</include> + <include>**/*.dtd</include> + <include>**/*.xsd</include> + </includes> + </resource> + + </resources> + + <testResources> + <testResource> + <directory>src/test/resources</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xhtml</include> + <include>**/*.html</include> + <include>**/*.xsl</include> + </includes> + </testResource> + <testResource> + <directory>src/test/java</directory> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + <include>**/*.xhtml</include> + <include>**/*.html</include> + <include>**/*.xsl</include> + </includes> + </testResource> + </testResources> + </build> </project> \ No newline at end of file Modified: core/trunk/packaging/module/pom.xml =================================================================== --- core/trunk/packaging/module/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/packaging/module/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,77 +1,77 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>core.packaging.module</artifactId> - <packaging>pom</packaging> - <name>eXo Core Build module</name> - - <properties> - <exobuild.name>core</exobuild.name> - <exobuild.type>module</exobuild.type> - </properties> - -  - <dependencies> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>prepare</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>target</outputDirectory> - <resources> - <resource> - <directory>src/main/javascript</directory> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> - <executions> - <execution> - <id>attach-artifacts</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> - <type>js</type> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>core.packaging.module</artifactId> + <packaging>pom</packaging> + <name>eXo Core Build module</name> + + <properties> + <exobuild.name>core</exobuild.name> + <exobuild.type>module</exobuild.type> + </properties> + +  + <dependencies> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.3.0-Beta04-SNAPSHOT</version></dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>prepare</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>target</outputDirectory> + <resources> + <resource> + <directory>src/main/javascript</directory> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.3</version> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${exobuild.name}.packaging.${exobuild.type}.js</file> + <type>js</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-18 08:43:13 UTC (rev 738) +++ core/trunk/pom.xml 2009-11-18 09:01:34 UTC (rev 739) @@ -1,396 +1,358 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.exoplatform</groupId> - <artifactId>foundation-parent</artifactId> - <version>3</version> - </parent> - - <groupId>org.exoplatform.core</groupId> - <artifactId>core-parent</artifactId> - <version>2.3.0-Beta04-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>eXo Core</name> - - <properties> - <exo.product.name>exo-core</exo.product.name> - <exo.product.specification>2.3</exo.product.specification> - - <org.exoplatform.kernel.version>2.2.0-Beta03</org.exoplatform.kernel.version> - <exo.test.includes>*Test*</exo.test.includes> - </properties> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk</developerConnection> - <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url> - </scm> - - <modules> - <module>exo.core.component.security.core</module> - <module>exo.core.component.database</module> - <module>exo.core.component.document</module> - <module>exo.core.component.ldap</module> - <module>exo.core.component.organization.api</module> - <module>exo.core.component.organization.jdbc</module> - <module>exo.core.component.organization.ldap</module> - <module>exo.core.component.xml-processing</module> - <module>exo.core.component.script.groovy</module> - <module>exo.core.component.web.css</module> - <module>packaging/module</module> - </modules> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.ldap</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - </dependency> - - <dependency> - <groupId>com.experlog</groupId> - <artifactId>xapool</artifactId> - <version>1.5.0</version> - </dependency> - - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.2</version> - </dependency> - - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - <version>1.2.3</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet</artifactId> - <version>1.2.3</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - - <dependency> - <groupId>pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>0.7.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>2.1.0</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi</artifactId> - <version>3.0.2-FINAL</version> - </dependency> - - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-scratchpad</artifactId> - <version>3.0.2-FINAL</version> - </dependency> - - <dependency> - <groupId>com.novell.ldap</groupId> - <artifactId>jldap</artifactId> - <version>4.3</version> - </dependency> - - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb</artifactId> - <version>2.1</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-hibernate-module</artifactId> - <version>1.2.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet</artifactId> - <version>1.2.3</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xdoclet-xdoclet-module</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>xdoclet</groupId> - <artifactId>xjavadoc</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - - <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <version>1.1.1501</version> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <version>9.1</version> - </dependency> - - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>9.1</version> - </dependency> - - <dependency> - <groupId>oracle</groupId> - <artifactId>ojdbc</artifactId> - <version>1.4</version> - </dependency> - - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.3-603.jdbc3</version> - </dependency> - - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.0.8</version> - </dependency> - - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.w3c</groupId> - <artifactId>sac</artifactId> - <version>1.3</version> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-util</artifactId> - <version>1.7</version> - </dependency> - - <dependency> - <groupId>batik</groupId> - <artifactId>batik-css</artifactId> - <version>1.7</version> - </dependency> - - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> - </dependency> - - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.4.0.GA</version> - </dependency> - - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>always</forkMode> - <excludes> - <exclude>**/*$*</exclude> - <exclude>**/DBCreatorTest.java</exclude> - <exclude>**/TestLDAPService.java</exclude> - <exclude>**/TestNovellLDAPAPI.java</exclude> - <exclude>**/TestStandardLDAPAPI.java</exclude> -  - <exclude>**/TestOrganizationService.java</exclude> - - <exclude>**/TestPipe.java</exclude> - <exclude>**/TestTidy.java</exclude> - </excludes> -  - </configuration> - </plugin> - </plugins> - - </build> -</project> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.exoplatform</groupId> + <artifactId>foundation-parent</artifactId> + <version>3</version> + </parent> + + <groupId>org.exoplatform.core</groupId> + <artifactId>core-parent</artifactId> + <version>2.3.0-Beta04-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>eXo Core</name> + + <properties> + <exo.product.name>exo-core</exo.product.name> + <exo.product.specification>2.3</exo.product.specification> + + <org.exoplatform.kernel.version>2.2.0-Beta04-SNAPSHOT</org.exoplatform.kernel.version> + <exo.test.includes>*Test*</exo.test.includes> + </properties> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/core/trunk</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk</developerConnection> + <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url> + </scm> + + <modules> + <module>exo.core.component.security.core</module> + <module>exo.core.component.database</module> + <module>exo.core.component.document</module> + <module>exo.core.component.ldap</module> + <module>exo.core.component.organization.api</module> + <module>exo.core.component.organization.jdbc</module> + <module>exo.core.component.organization.ldap</module> + <module>exo.core.component.xml-processing</module> + <module>exo.core.component.script.groovy</module> + <module>exo.core.component.web.css</module> + <module>packaging/module</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.exoplatform.tool</groupId> + <artifactId>exo.tool.framework.junit</artifactId> + <version>1.2.0</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.ldap</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + + <dependency> + <groupId>pull-parser</groupId> + <artifactId>pull-parser</artifactId> + <version>2</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + + <dependency> + <groupId>com.experlog</groupId> + <artifactId>xapool</artifactId> + <version>1.5.0</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> + </dependency> + + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.0.2</version> + </dependency> + + <dependency> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.1</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-hibernate-module</artifactId> + <version>1.2.3</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xdoclet-xdoclet-module</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>xdoclet</groupId> + <artifactId>xjavadoc</artifactId> + <version>1.0.3</version> + </dependency> + + <dependency> + <groupId>com.microsoft</groupId> + <artifactId>sqljdbc</artifactId> + <version>1.1.1501</version> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <version>9.1</version> + </dependency> + + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>9.1</version> + </dependency> + + <dependency> + <groupId>oracle</groupId> + <artifactId>ojdbc</artifactId> + <version>1.4</version> + </dependency> + + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.3-603.jdbc3</version> + </dependency> + + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.0.8</version> + </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.6.5</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + </dependency> + + <dependency> + <groupId>pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>0.7.3</version> + </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.0</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.6</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi</artifactId> + <version>3.0.2-FINAL</version> + </dependency> + + <dependency> + <groupId>org.apache.poi</groupId> + <artifactId>poi-scratchpad</artifactId> + <version>3.0.2-FINAL</version> + </dependency> + + <dependency> + <groupId>com.novell.ldap</groupId> + <artifactId>jldap</artifactId> + <version>4.3</version> + </dependency> + + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-util</artifactId> + <version>1.7</version> + </dependency> + + <dependency> + <groupId>batik</groupId> + <artifactId>batik-css</artifactId> + <version>1.7</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkMode>always</forkMode> + <excludes> + <exclude>**/*$*</exclude> + <exclude>**/DBCreatorTest.java</exclude> + <exclude>**/TestLDAPService.java</exclude> + <exclude>**/TestNovellLDAPAPI.java</exclude> + <exclude>**/TestStandardLDAPAPI.java</exclude> +  + <exclude>**/TestOrganizationService.java</exclude> + + <exclude>**/TestPipe.java</exclude> + <exclude>**/TestTidy.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + + </build> +</project>

16 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits November 2009