exo-jcr SVN: r1576 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-01-26 06:25:47 -0500 (Tue, 26 Jan 2010)
New Revision: 1576
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
Log:
EXOJCR-440: ResultSet.isAfterLast() removed
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2010-01-26 10:39:57 UTC (rev 1575)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2010-01-26 11:25:47 UTC (rev 1576)
@@ -153,10 +153,11 @@
public List<NodeData> getChildNodesData(NodeData parent) throws RepositoryException, IllegalStateException
{
checkIfOpened();
+ ResultSet resultSet = null;
try
{
// query will return nodes and properties in same result set
- ResultSet resultSet = findChildNodesByParentIdentifierCQ(getInternalId(parent.getIdentifier()));
+ resultSet = findChildNodesByParentIdentifierCQ(getInternalId(parent.getIdentifier()));
TempNodeData data = null;
List<NodeData> childNodes = new ArrayList<NodeData>();
while (resultSet.next())
@@ -196,6 +197,20 @@
{
throw new RepositoryException(e);
}
+ finally
+ {
+ if (resultSet != null)
+ {
+ try
+ {
+ resultSet.close();
+ }
+ catch (SQLException e)
+ {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+ }
}
/**
@@ -204,14 +219,71 @@
public List<PropertyData> getChildPropertiesData(NodeData parent) throws RepositoryException, IllegalStateException
{
checkIfOpened();
+ ResultSet resultSet = null;
try
{
- ResultSet resultSet = findChildPropertiesByParentIdentifierCQ(getInternalId(parent.getIdentifier()));
+ resultSet = findChildPropertiesByParentIdentifierCQ(getInternalId(parent.getIdentifier()));
List<PropertyData> children = new ArrayList<PropertyData>();
+
+ QPath parentPath = parent.getQPath();
+
if (resultSet.next())
{
- while (!resultSet.isAfterLast())
- children.add(loadPropertyRecord(resultSet, parent.getQPath()));
+ boolean isNotLast = true;
+
+ do
+ {
+ // read property data
+ String cid = resultSet.getString(COLUMN_ID);
+ String identifier = getIdentifier(cid);
+
+ String cname = resultSet.getString(COLUMN_NAME);
+ int cversion = resultSet.getInt(COLUMN_VERSION);
+
+ String cpid = resultSet.getString(COLUMN_PARENTID);
+ // if parent ID is empty string - it's a root node
+
+ int cptype = resultSet.getInt(COLUMN_PTYPE);
+ boolean cpmultivalued = resultSet.getBoolean(COLUMN_PMULTIVALUED);
+ QPath qpath;
+ try
+ {
+ qpath =
+ QPath.makeChildPath(parentPath == null ? traverseQPath(cpid) : parentPath, InternalQName
+ .parse(cname));
+ }
+ catch (IllegalNameException e)
+ {
+ throw new RepositoryException(e.getMessage(), e);
+ }
+
+ // read values
+ List<ValueData> data = new ArrayList<ValueData>();
+ do
+ {
+ int orderNum = resultSet.getInt(COLUMN_VORDERNUM);
+ // check is there value columns
+ if (!resultSet.wasNull())
+ {
+ final String storageId = resultSet.getString(COLUMN_VSTORAGE_DESC);
+ ValueData vdata =
+ resultSet.wasNull() ? readValueData(cid, orderNum, cversion, resultSet
+ .getBinaryStream(COLUMN_VDATA)) : readValueData(identifier, orderNum, storageId);
+ data.add(vdata);
+ }
+
+ isNotLast = resultSet.next();
+ }
+ while (isNotLast && resultSet.getString(COLUMN_ID).equals(cid));
+
+ //create property
+ PersistedPropertyData pdata =
+ new PersistedPropertyData(identifier, qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued,
+ data);
+
+ children.add(pdata);
+ }
+ while (isNotLast);
}
return children;
}
@@ -223,6 +295,21 @@
{
throw new RepositoryException(e);
}
+ finally
+ {
+ if (resultSet != null)
+ {
+ try
+ {
+ resultSet.close();
+ }
+ catch (SQLException e)
+ {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+ }
+
}
/**
@@ -231,9 +318,10 @@
public List<PropertyData> getReferencesData(String nodeIdentifier) throws RepositoryException, IllegalStateException
{
checkIfOpened();
+ ResultSet refProps = null;
try
{
- ResultSet refProps = findReferencePropertiesCQ(getInternalId(nodeIdentifier));
+ refProps = findReferencePropertiesCQ(getInternalId(nodeIdentifier));
return loadReferences(refProps);
}
catch (SQLException e)
@@ -244,6 +332,21 @@
{
throw new RepositoryException(e);
}
+ finally
+ {
+ if (refProps != null)
+ {
+ try
+ {
+ refProps.close();
+ }
+ catch (SQLException e)
+ {
+ LOG.error(e.getMessage(), e);
+ }
+ }
+ }
+
}
/**
@@ -589,67 +692,6 @@
}
/**
- * Load property record from result set. Result set must be ordered by property id.
- * In other way there may be mistaces.
- *
- * @param resultSet - Result set
- * @param parentPath - parent qpath - needed to create property qpath. May be null.
- * @return PersistedPropertyData
- * @throws RepositoryException
- * @throws SQLException
- * @throws IOException
- */
- protected PersistedPropertyData loadPropertyRecord(ResultSet resultSet, QPath parentPath)
- throws RepositoryException, SQLException, IOException
- {
- String cid = resultSet.getString(COLUMN_ID);
- String cname = resultSet.getString(COLUMN_NAME);
- int cversion = resultSet.getInt(COLUMN_VERSION);
-
- String cpid = resultSet.getString(COLUMN_PARENTID);
- // if parent ID is empty string - it's a root node
- try
- {
- int cptype = resultSet.getInt(COLUMN_PTYPE);
- boolean cpmultivalued = resultSet.getBoolean(COLUMN_PMULTIVALUED);
- QPath qpath =
- QPath.makeChildPath(parentPath == null ? traverseQPath(cpid) : parentPath, InternalQName.parse(cname));
-
- List<ValueData> data = new ArrayList<ValueData>();
- String identifier = getIdentifier(cid);
-
- do
- {
- int orderNum = resultSet.getInt(COLUMN_VORDERNUM);
- //check is there value columns
- if (!resultSet.wasNull())
- {
- final String storageId = resultSet.getString(COLUMN_VSTORAGE_DESC);
- ValueData vdata =
- resultSet.wasNull() ? readValueData(cid, orderNum, cversion, resultSet.getBinaryStream(COLUMN_VDATA))
- : readValueData(identifier, orderNum, storageId);
- data.add(vdata);
- }
- }
- while (resultSet.next() && resultSet.getString(COLUMN_ID).equals(cid));
-
- PersistedPropertyData pdata =
- new PersistedPropertyData(identifier, qpath, getIdentifier(cpid), cversion, cptype, cpmultivalued, data);
-
- return pdata;
- }
- catch (IllegalNameException e)
- {
- throw new RepositoryException(e);
- }
- catch (InvalidItemStateException e)
- {
- throw new InvalidItemStateException("FATAL: Can't build item path for name " + cname + " id: "
- + getIdentifier(cid) + ". " + e);
- }
- }
-
- /**
* {@inheritDoc}
*/
@Override
14 years, 3 months
exo-jcr SVN: r1575 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: skabashnyuk
Date: 2010-01-26 05:39:57 -0500 (Tue, 26 Jan 2010)
New Revision: 1575
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-397 : Do nothing in read_only mode
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2010-01-26 08:42:43 UTC (rev 1574)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2010-01-26 10:39:57 UTC (rev 1575)
@@ -166,7 +166,7 @@
* The time this index was last flushed or a transaction was committed.
*/
private long lastFileSystemFlushTime;
-
+
/**
* The <code>IndexMerger</code> for this <code>MultiIndex</code>.
*/
@@ -889,55 +889,58 @@
*/
void close()
{
+ if (modeHandler.getMode().equals(IndexerIoMode.READ_WRITE))
+ {
- // stop index merger
- // when calling this method we must not lock this MultiIndex, otherwise
- // a deadlock might occur
- merger.dispose();
+ // stop index merger
+ // when calling this method we must not lock this MultiIndex, otherwise
+ // a deadlock might occur
+ merger.dispose();
- synchronized (this)
- {
- // stop timer
- if (flushTask != null)
+ synchronized (this)
{
- flushTask.cancel();
- }
+ // stop timer
+ if (flushTask != null)
+ {
+ flushTask.cancel();
+ }
- // commit / close indexes
- try
- {
- releaseMultiReader();
- }
- catch (IOException e)
- {
- log.error("Exception while closing search index.", e);
- }
- try
- {
- flush();
- }
- catch (IOException e)
- {
- log.error("Exception while closing search index.", e);
- }
- volatileIndex.close();
- for (int i = 0; i < indexes.size(); i++)
- {
- ((PersistentIndex)indexes.get(i)).close();
- }
+ // commit / close indexes
+ try
+ {
+ releaseMultiReader();
+ }
+ catch (IOException e)
+ {
+ log.error("Exception while closing search index.", e);
+ }
+ try
+ {
+ flush();
+ }
+ catch (IOException e)
+ {
+ log.error("Exception while closing search index.", e);
+ }
+ volatileIndex.close();
+ for (int i = 0; i < indexes.size(); i++)
+ {
+ ((PersistentIndex)indexes.get(i)).close();
+ }
- // close indexing queue
- indexingQueue.close();
+ // close indexing queue
+ indexingQueue.close();
- // finally close directory
- try
- {
- indexDir.close();
+ // finally close directory
+ try
+ {
+ indexDir.close();
+ }
+ catch (IOException e)
+ {
+ log.error("Exception while closing directory.", e);
+ }
}
- catch (IOException e)
- {
- log.error("Exception while closing directory.", e);
- }
}
}
@@ -989,9 +992,13 @@
{
ItemData data = handler.getContext().getItemStateManager().getItemData(id);
if (data == null)
+ {
throw new ItemNotFoundException("Item id=" + id + " not found");
+ }
if (!data.isNode())
+ {
throw new RepositoryException("Item with id " + id + " is not a node");
+ }
return createDocument((NodeData)data);
}
@@ -1065,7 +1072,7 @@
}
}
executeAndLog(new Commit(getTransactionId()));
-
+
indexNames.write();
// reset redo log
@@ -2465,11 +2472,11 @@
while (iterator.hasNext())
{
PersistentIndex index = iterator.next();
- String name = ((PersistentIndex)index).getName();
+ String name = index.getName();
// if current index not in new list, close it, cause it is deleted.
if (!newList.contains(name))
{
- ((PersistentIndex)index).close();
+ index.close();
iterator.remove();
}
else
14 years, 3 months
exo-jcr SVN: r1574 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-01-26 03:42:43 -0500 (Tue, 26 Jan 2010)
New Revision: 1574
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-395 : Add procedding error log on coordinator in SearchIndex if changed coordinator.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-01-26 08:27:18 UTC (rev 1573)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-01-26 08:42:43 UTC (rev 1574)
@@ -53,6 +53,7 @@
import org.exoplatform.services.jcr.impl.core.query.ErrorLog;
import org.exoplatform.services.jcr.impl.core.query.ExecutableQuery;
import org.exoplatform.services.jcr.impl.core.query.IndexerIoMode;
+import org.exoplatform.services.jcr.impl.core.query.IndexerIoModeListener;
import org.exoplatform.services.jcr.impl.core.query.QueryHandler;
import org.exoplatform.services.jcr.impl.core.query.QueryHandlerContext;
import org.exoplatform.services.jcr.impl.core.query.SearchIndexConfigurationHelper;
@@ -88,7 +89,7 @@
* Implements a {@link org.apache.jackrabbit.core.query.QueryHandler} using
* Lucene.
*/
-public class SearchIndex extends AbstractQueryHandler
+public class SearchIndex extends AbstractQueryHandler implements IndexerIoModeListener
{
private static final DefaultQueryNodeFactory DEFAULT_QUERY_NODE_FACTORY = new DefaultQueryNodeFactory();
@@ -595,7 +596,8 @@
{
recoverErrorLog(errorLog);
}
-
+
+ modeHandler.addIndexerIoModeListener(this);
}
/**
@@ -2691,4 +2693,28 @@
return new LuceneQueryHits(reader, searcher, query);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public void onChangeMode(IndexerIoMode mode)
+ {
+ try
+ {
+ if (mode == IndexerIoMode.READ_WRITE)
+ {
+ // reprocess any notfinished notifies;
+ log.info("Proceessing eroor log ...");
+ recoverErrorLog(errorLog);
+ }
+ }
+ catch (IOException e)
+ {
+ log.error("Can not recover error log. On changed mode " + mode , e);
+ }
+ catch (RepositoryException e)
+ {
+ log.error("Can not recover error log.", e);
+ }
+ }
}
14 years, 3 months
exo-jcr SVN: r1573 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/xml/importing and 1 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-01-26 03:27:18 -0500 (Tue, 26 Jan 2010)
New Revision: 1573
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/DecodedValue.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java
Log:
EXOJCR-438: Added special test and applied proposed patch for SysView import.
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/DecodedValue.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/DecodedValue.java 2010-01-25 14:46:56 UTC (rev 1572)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/DecodedValue.java 2010-01-26 08:27:18 UTC (rev 1573)
@@ -49,6 +49,11 @@
private StringBuffer stringBuffer;
/**
+ * true if DecodedValue is completed
+ */
+ private boolean complete;
+
+ /**
* Dafault constructor.
*/
public DecodedValue()
@@ -112,6 +117,26 @@
}
/**
+ * Used to determine the end of value tag in system view import.
+ *
+ * @param complete
+ */
+ public void setComplete(boolean complete)
+ {
+ this.complete = complete;
+ }
+
+ /**
+ * Used to determine the end of value tag in system view import.
+ *
+ * @return
+ */
+ public boolean isComplete()
+ {
+ return complete;
+ }
+
+ /**
* @return string representation for value.
*/
public String toString()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2010-01-25 14:46:56 UTC (rev 1572)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2010-01-26 08:27:18 UTC (rev 1573)
@@ -104,6 +104,11 @@
if (propertyInfo.getValues().size() > 0)
{
DecodedValue curPropValue = propertyInfo.getValues().get(propertyInfo.getValues().size() - 1);
+ if (curPropValue.isComplete())
+ {
+ return;
+ }
+
if (propertyInfo.getType() == PropertyType.BINARY)
{
try
@@ -122,7 +127,7 @@
}
else
{
- log.warn("Wrong XML content. Element 'sv:value' expected,"
+ log.debug("Wrong XML content. Element 'sv:value' expected,"
+ " but SAX event 'characters' occured. characters:[" + new String(ch, start, length) + "]");
}
}
@@ -150,6 +155,9 @@
else if (Constants.SV_VALUE_NAME.equals(elementName))
{
// sv:value element
+ //mark current value as completed
+ DecodedValue curPropValue = propertyInfo.getValues().get(propertyInfo.getValues().size() - 1);
+ curPropValue.setComplete(true);
}
else
{
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java 2010-01-25 14:46:56 UTC (rev 1572)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java 2010-01-26 08:27:18 UTC (rev 1573)
@@ -141,6 +141,64 @@
"</sv:node>";
+ public static final String SYSTEM_VIEW_CONTENT_FORMATTED =
+ "<sv:node xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" xmlns:jcr=\"http://www.jcp.org/jcr/1.0\"\n "
+ + "xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\" xmlns:exo=\"http://www.exoplatform.com/jcr/exo/1.0\"\n "
+ + "xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\" sv:name=\"exo:test\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:unstructured</sv:value>\n </sv:property>\n\n "
+ + "<sv:node sv:name=\"childNode\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:folder</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:created\" sv:type=\"Date\">\n <sv:value>2004-08-18T15:17:00.856+01:00</sv:value>\n </sv:property>\n "
+ + "<sv:node sv:name=\"childNode3\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:file</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:created\" sv:type=\"Date\">\n <sv:value>2004-08-18T15:17:00.856+01:00</sv:value>\n </sv:property>\n "
+ + "<sv:node sv:name=\"jcr:content\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:resource</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:uuid\" sv:type=\"String\">\n <sv:value>1092835020617_</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:data\" sv:type=\"Binary\">\n <sv:value>dGhpcyBpcyB0aGUgYmluYXJ5IGNvbnRlbnQ=</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:mimeType\" sv:type=\"String\">\n <sv:value>application/unknown</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:lastModified\" sv:type=\"Date\">\n <sv:value>2004-08-18T15:17:00.856+01:00</sv:value>\n </sv:property>\n "
+ + "</sv:node>\n "
+ + "</sv:node>\n "
+ + "<sv:node sv:name=\"childNode2\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:file</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:created\" sv:type=\"Date\">\n <sv:value>2004-08-18T15:17:00.856+01:00</sv:value>\n </sv:property>\n "
+ + "<sv:node sv:name=\"jcr:content\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n <sv:value>nt:resource</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:uuid\" sv:type=\"String\">\n <sv:value>1092835020616_</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:data\" sv:type=\"Binary\">\n <sv:value>dGhpcyBpcyB0aGUgYmluYXJ5IGNvbnRlbnQ=</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:mimeType\" sv:type=\"String\">\n <sv:value>text/text</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:lastModified\" sv:type=\"Date\">\n <sv:value>2004-08-18T15:17:00.856+01:00</sv:value>\n </sv:property>\n "
+ + "</sv:node>\n "
+ + "</sv:node>\n "
+ + "</sv:node>\n\n "
+ + "<sv:node sv:name='uuidNode1'>\n "
+ + "<sv:property sv:name='jcr:primaryType' sv:type='Name'>\n <sv:value>nt:unstructured</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:mixinTypes' sv:type='Name'>\n <sv:value>mix:referenceable</sv:value>\n "
+ + "<!-- sv:value>exo:accessControllable</sv:value -->\n "
+ + "</sv:property>\n "
+ + "<sv:property sv:name='jcr:test' sv:type='String'>\n <sv:value>val1</sv:value>\n <sv:value>val1</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='source' sv:type='String'>\n <sv:value>sysView</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:uuid' sv:type='String'>\n <sv:value>id_uuidNode1</sv:value>\n </sv:property>\n </sv:node>\n\n "
+ + "<sv:node sv:name='uuidNode2'>\n "
+ + "<sv:property sv:name='jcr:primaryType' sv:type='Name'>\n <sv:value>nt:unstructured</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:mixinTypes' sv:type='Name'>\n <sv:value>mix:referenceable</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:test' sv:type='String'>\n <sv:value>val2</sv:value>\n <sv:value>val1</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:uuid' sv:type='String'>\n <sv:value>uuidNode2</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='ref_to_1' sv:type='Reference'>\n <sv:value>id_uuidNode1</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='ref_to_1_and_3' sv:type='Reference'>\n <sv:value>id_uuidNode1</sv:value>\n <sv:value>id_uuidNode3</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='ref_to_3' sv:type='Reference'>\n <sv:value>id_uuidNode3</sv:value>\n </sv:property>\n </sv:node>\n\n <sv:node sv:name='uuidNode3'>\n "
+ + "<sv:property sv:name='jcr:primaryType' sv:type='Name'>\n <sv:value>nt:unstructured</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:mixinTypes' sv:type='Name'>\n <sv:value>mix:referenceable</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='ref_to_1' sv:type='Reference'>\n <sv:value>id_uuidNode1</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name='jcr:test' sv:type='String'>\n <sv:value>val1</sv:value>\n <sv:value>va31</sv:value>\n </sv:property>\n <sv:property sv:name='jcr:uuid' sv:type='String'>\n <sv:value>id_uuidNode3</sv:value>\n </sv:property>\n "
+ + "</sv:node>\n\n "
+ + "<sv:node sv:name=\"childNode4\">\n "
+ + "<sv:property sv:name=\"jcr:primaryType\" sv:type=\"Name\">\n "
+ + "<sv:value>nt:unstructured</sv:value>\n </sv:property>\n "
+ + "<sv:property sv:name=\"jcr:test\" sv:type=\"String\">\n <sv:value>val1</sv:value>\n <sv:value>val1</sv:value>\n </sv:property>\n "
+ + "</sv:node>\n\n" + "</sv:node>";
+
public static final String SYSTEM_VIEW_CONTENT2 =
"<sv:node xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\" "
+ "xmlns:jcr=\"http://www.jcp.org/jcr/1.0\" "
@@ -441,6 +499,34 @@
assertEquals("val1", property.getValues()[0].getString());
}
+ public void testImportSysViewFormatted() throws RepositoryException, InvalidSerializedDataException,
+ ConstraintViolationException, IOException, ItemExistsException
+ {
+
+ root.addNode("testFormatted");
+ session.importXML("/testFormatted", new ByteArrayInputStream(SYSTEM_VIEW_CONTENT_FORMATTED.getBytes()), 0);
+ session.save();
+
+ Node testRoot = session.getRootNode().getNode("testFormatted");
+ NodeIterator iterator = testRoot.getNodes();
+ assertEquals(1, iterator.getSize());
+
+ // log.debug(">>"+session.getWorkspaceDataContainer());
+
+ iterator = testRoot.getNode("exo:test/childNode").getNodes();
+ assertEquals(2, iterator.getSize());
+
+ Property property = testRoot.getProperty("exo:test/childNode/childNode3/jcr:content/jcr:data");
+ assertEquals("this is the binary content", property.getString());
+
+ property = testRoot.getProperty("exo:test/childNode/childNode2/jcr:content/jcr:data");
+ assertEquals("this is the binary content", property.getString());
+
+ property = testRoot.getProperty("exo:test/childNode4/jcr:test");
+ assertEquals(2, property.getValues().length);
+ assertEquals("val1", property.getValues()[0].getString());
+ }
+
public void testImportSysViewContentHandler() throws Exception
{
14 years, 3 months
exo-jcr SVN: r1572 - jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-01-25 09:46:56 -0500 (Mon, 25 Jan 2010)
New Revision: 1572
Modified:
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
Log:
EXOJCR-432 fix of SQL scripts
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.derby.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,40 +1,31 @@
CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_CONTAINER PRIMARY KEY(VERSION)
+ VERSION VARCHAR(96) NOT NULL,
+ CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
- VERSION INTEGER NOT NULL,
- PATH VARCHAR(4096) NOT NULL,
- CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID)
-);
-CREATE UNIQUE INDEX JCR_IDX_MITEM_PATH ON JCR_MITEM(PATH, ID, VERSION DESC);
-CREATE TABLE JCR_MNODE(
- ID VARCHAR(96) NOT NULL,
- ORDER_NUM INTEGER,
- PARENT_ID VARCHAR(96),
- CONSTRAINT JCR_PK_MNODE PRIMARY KEY(ID),
- CONSTRAINT JCR_FK_MNODE_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID),
- CONSTRAINT JCR_FK_MNODE_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
-);
-CREATE UNIQUE INDEX JCR_IDX_MNODE_PARENTID ON JCR_MNODE(PARENT_ID, ID, ORDER_NUM);
-CREATE TABLE JCR_MPROPERTY(
- ID VARCHAR(96) NOT NULL,
- TYPE INTEGER NOT NULL,
PARENT_ID VARCHAR(96) NOT NULL,
- MULTIVALUED INTEGER NOT NULL,
- CONSTRAINT JCR_PK_MPROPERTY PRIMARY KEY(ID),
- CONSTRAINT JCR_FK_MPROPERTY_NODE FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID),
- CONSTRAINT JCR_FK_MPROPERTY_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
- );
-CREATE UNIQUE INDEX JCR_IDX_MPROPERTY_PARENTID ON JCR_MPROPERTY(PARENT_ID, ID);
+ NAME VARCHAR(512) NOT NULL,
+ VERSION INTEGER NOT NULL,
+ I_CLASS INTEGER NOT NULL,
+ I_INDEX INTEGER NOT NULL,
+ N_ORDER_NUM INTEGER,
+ P_TYPE INTEGER,
+ P_MULTIVALUED INTEGER,
+ CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
+ CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
+);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_MVALUE(
ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
- DATA BLOB(56M) NOT NULL,
- ORDER_NUM INTEGER,
+ DATA BLOB(56M),
+ ORDER_NUM INTEGER NOT NULL,
PROPERTY_ID VARCHAR(96) NOT NULL,
+ STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
- CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
+ CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
);
CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_MREF(
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.mssql.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,6 +1,6 @@
CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+ VERSION VARCHAR(96) NOT NULL,
+ CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
@@ -25,7 +25,7 @@
PROPERTY_ID VARCHAR(96) NOT NULL,
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
- CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
+ CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
);
CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_MREF(
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.pgsql.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,6 +1,6 @@
CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
- CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+ VERSION VARCHAR(96) NOT NULL,
+ CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
);
CREATE TABLE JCR_MITEM(
ID VARCHAR(96) NOT NULL,
@@ -14,7 +14,7 @@
P_MULTIVALUED BOOLEAN,
CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
- );
+);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION);
CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION);
@@ -26,12 +26,12 @@
STORAGE_DESC VARCHAR(512),
CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
- );
+);
CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_MREF(
- NODE_ID VARCHAR(96) NOT NULL,
- PROPERTY_ID VARCHAR(96) NOT NULL,
- ORDER_NUM INTEGER NOT NULL,
- CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
- );
+ NODE_ID VARCHAR(96) NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ ORDER_NUM INTEGER NOT NULL,
+ CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+);
CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-mjdbc.sybase.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -39,45 +39,39 @@
*/
CREATE TABLE JCR_MCONTAINER(
- VERSION VARCHAR(255) NOT NULL PRIMARY KEY
- );
+ VERSION VARCHAR(96) NOT NULL,
+ CONSTRAINT JCR_PK_MCONTAINER PRIMARY KEY(VERSION)
+);
CREATE TABLE JCR_MITEM(
- ID VARCHAR(255) NOT NULL PRIMARY KEY,
+ ID VARCHAR(96) NOT NULL,
+ PARENT_ID VARCHAR(96) NOT NULL,
+ NAME VARCHAR(512) NOT NULL,
VERSION INT NOT NULL,
- PATH VARCHAR(1024) NOT NULL
- );
-CREATE INDEX JCR_IDX_MITEM_IDPATH ON JCR_MITEM(ID, SUBSTRING(PATH, 1, 345));
-CREATE TABLE JCR_MNODE(
- ID VARCHAR(255) NOT NULL PRIMARY KEY,
- ORDER_NUM INTEGER NULL,
- PARENT_ID VARCHAR(255) NULL,
- CONSTRAINT JCR_FK_MNODE_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID),
- CONSTRAINT JCR_FK_MNODE_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
- );
-CREATE INDEX JCR_IDX_MNODE_PARENT ON JCR_MNODE(ID, PARENT_ID, ORDER_NUM);
-CREATE TABLE JCR_MPROPERTY(
- ID VARCHAR(255) NOT NULL PRIMARY KEY,
- TYPE INT NOT NULL,
- PARENT_ID VARCHAR(255) NOT NULL,
- MULTIVALUED INT NOT NULL,
- CONSTRAINT JCR_FK_MPROPERTY_NODE FOREIGN KEY(PARENT_ID) REFERENCES JCR_MNODE(ID),
- CONSTRAINT JCR_FK_MPROPERTY_ITEM FOREIGN KEY(ID) REFERENCES JCR_MITEM(ID)
- );
-CREATE INDEX JCR_IDX_MPROPERTY_PARENT ON JCR_MPROPERTY(ID, PARENT_ID);
-CREATE INDEX JCR_IDX_MPROPERTY_TYPE ON JCR_MPROPERTY(ID, TYPE);
+ I_CLASS INT NOT NULL,
+ I_INDEX INT NOT NULL,
+ N_ORDER_NUM INT,
+ P_TYPE INT,
+ P_MULTIVALUED INT,
+ CONSTRAINT JCR_PK_MITEM PRIMARY KEY(ID),
+ CONSTRAINT JCR_FK_MITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_MITEM(ID)
+);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT ON JCR_MITEM(PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_NAME ON JCR_MITEM(I_CLASS, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_MITEM_PARENT_ID ON JCR_MITEM(I_CLASS, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_MVALUE(
- ID BIGINT IDENTITY NOT NULL PRIMARY KEY,
- DATA VARBINARY(255) NOT NULL,
- ORDER_NUM INT NULL,
- PROPERTY_ID VARCHAR(255) NOT NULL,
- CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MPROPERTY(ID)
- );
-CREATE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
-CREATE INDEX JCR_IDX_MVALUE_DATA ON JCR_MVALUE(PROPERTY_ID, DATA);
-CREATE TABLE JCR_SREF(
- NODE_ID VARCHAR(255) NOT NULL,
- PROPERTY_ID VARCHAR(255) NOT NULL,
- ORDER_NUM INTEGER NOT NULL,
- CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+ ID BIGINT IDENTITY NOT NULL,
+ DATA VARBINARY(255),
+ ORDER_NUM INT NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ STORAGE_DESC VARCHAR(512),
+ CONSTRAINT JCR_PK_MVALUE PRIMARY KEY(ID),
+ CONSTRAINT JCR_FK_MVALUE_PROPERTY FOREIGN KEY(PROPERTY_ID) REFERENCES JCR_MITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
+CREATE UNIQUE INDEX JCR_IDX_MVALUE_PROPERTY ON JCR_MVALUE(PROPERTY_ID, ORDER_NUM);
+CREATE TABLE JCR_MREF(
+ NODE_ID VARCHAR(96) NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ ORDER_NUM INT NOT NULL,
+ CONSTRAINT JCR_PK_MREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+);
+CREATE UNIQUE INDEX JCR_IDX_MREF_PROPERTY ON JCR_MREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PAREN FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE INDEX JCR_IDX_SITEM_PARENT_FK ON JCR_SITEM(PARENT_ID);
CREATE TABLE JCR_SVALUE(
ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
@@ -31,9 +31,9 @@
);
CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_SREF(
- NODE_ID VARCHAR(96) NOT NULL,
- PROPERTY_ID VARCHAR(96) NOT NULL,
- ORDER_NUM INTEGER NOT NULL,
- CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+ NODE_ID VARCHAR(96) NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ ORDER_NUM INTEGER NOT NULL,
+ CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
);
CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.db2v8.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PAREN FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_P ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PN ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_P ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PN ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE INDEX JCR_IDX_SITEM_PFK ON JCR_SITEM(PARENT_ID);
CREATE TABLE JCR_SVALUE(
ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
@@ -31,9 +31,9 @@
);
CREATE UNIQUE INDEX JCR_IDX_SVALUE_P ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_SREF(
- NODE_ID VARCHAR(96) NOT NULL,
- PROPERTY_ID VARCHAR(96) NOT NULL,
- ORDER_NUM INTEGER NOT NULL,
- CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+ NODE_ID VARCHAR(96) NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ ORDER_NUM INTEGER NOT NULL,
+ CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
);
CREATE UNIQUE INDEX JCR_IDX_SREF_P ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.derby.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
DATA BLOB(56M),
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mssql.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
ID BIGINT IDENTITY(1,1) NOT NULL,
DATA VARBINARY(MAX),
@@ -30,9 +30,9 @@
);
CREATE UNIQUE INDEX JCR_IDX_SVALUE_PROPERTY ON JCR_SVALUE(PROPERTY_ID, ORDER_NUM);
CREATE TABLE JCR_SREF(
- NODE_ID VARCHAR(96) NOT NULL,
- PROPERTY_ID VARCHAR(96) NOT NULL,
- ORDER_NUM INTEGER NOT NULL,
- CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
+ NODE_ID VARCHAR(96) NOT NULL,
+ PROPERTY_ID VARCHAR(96) NOT NULL,
+ ORDER_NUM INTEGER NOT NULL,
+ CONSTRAINT JCR_PK_SREF PRIMARY KEY(NODE_ID, PROPERTY_ID, ORDER_NUM)
);
CREATE UNIQUE INDEX JCR_IDX_SREF_PROPERTY ON JCR_SREF(PROPERTY_ID, ORDER_NUM);
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql-utf8.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME(300), I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
ID SERIAL NOT NULL,
DATA LONGBLOB,
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.mysql.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
ID SERIAL NOT NULL,
DATA LONGBLOB,
Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2010-01-25 11:44:10 UTC (rev 1571)
+++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/storage/jcr-sjdbc.sql 2010-01-25 14:46:56 UTC (rev 1572)
@@ -1,5 +1,5 @@
CREATE TABLE JCR_SCONTAINER(
- VERSION VARCHAR(96) NOT NULL,
+ VERSION VARCHAR(96) NOT NULL,
CONSTRAINT JCR_PK_SCONTAINER PRIMARY KEY(VERSION)
);
CREATE TABLE JCR_SITEM(
@@ -16,9 +16,9 @@
CONSTRAINT JCR_PK_SITEM PRIMARY KEY(ID),
CONSTRAINT JCR_FK_SITEM_PARENT FOREIGN KEY(PARENT_ID) REFERENCES JCR_SITEM(ID)
);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION);
-CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT ON JCR_SITEM(CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, I_CLASS, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_NAME ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, NAME, I_INDEX, VERSION DESC);
+CREATE UNIQUE INDEX JCR_IDX_SITEM_PARENT_ID ON JCR_SITEM(I_CLASS, CONTAINER_NAME, PARENT_ID, ID, VERSION DESC);
CREATE TABLE JCR_SVALUE(
ID BIGINT generated by default as identity (START WITH 2, INCREMENT BY 1) NOT NULL,
DATA VARBINARY(65535),
14 years, 3 months
exo-jcr SVN: r1571 - in kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler: impl and 1 other directory.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-01-25 06:44:10 -0500 (Mon, 25 Jan 2010)
New Revision: 1571
Modified:
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/CronJob.java
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
Log:
EXOJCR-431 : Apply the patch to kernal 2.2.0-CR1-SNAPSHOT
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/CronJob.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/CronJob.java 2010-01-25 10:54:00 UTC (rev 1570)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/CronJob.java 2010-01-25 11:44:10 UTC (rev 1571)
@@ -21,6 +21,7 @@
import org.exoplatform.commons.utils.ExoProperties;
import org.exoplatform.container.component.BaseComponentPlugin;
import org.exoplatform.container.xml.InitParams;
+import org.quartz.JobDataMap;
/**
* Created by The eXo Platform SAS Author : Hoa Pham
@@ -31,6 +32,8 @@
private String expression_;
private JobInfo jinfo_;
+
+ private JobDataMap jdatamap_;
public CronJob(InitParams params) throws Exception
{
@@ -54,4 +57,10 @@
{
return expression_;
}
+
+ public JobDataMap getJobDataMap()
+ {
+ return jdatamap_;
+ }
+
}
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2010-01-25 10:54:00 UTC (rev 1570)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/scheduler/impl/JobSchedulerServiceImpl.java 2010-01-25 11:44:10 UTC (rev 1571)
@@ -165,7 +165,8 @@
public void addCronJob(ComponentPlugin plugin) throws Exception
{
CronJob cjob = (CronJob)plugin;
- addCronJob(cjob.getJobInfo(), cjob.getExpression());
+ addCronJob(cjob.getJobInfo(),cjob.getExpression(), cjob.getJobDataMap());
+
}
public void addCronJob(JobInfo jinfo, String exp, JobDataMap jdatamap) throws Exception
14 years, 3 months
exo-jcr SVN: r1570 - jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-01-25 05:54:00 -0500 (Mon, 25 Jan 2010)
New Revision: 1570
Modified:
jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
Log:
EXOJCR-407 exo dependencies versions updated
Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd
===================================================================
--- jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-01-25 10:52:14 UTC (rev 1569)
+++ jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.cmd 2010-01-25 10:54:00 UTC (rev 1570)
@@ -1 +1 @@
-java -jar exo.jcr.applications.backupconsole-1.12.0-Beta06-SNAPSHOT.jar %*
+java -jar exo.jcr.applications.backupconsole-1.12.0-CR1-SNAPSHOT.jar %*
Modified: jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.sh
===================================================================
--- jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-01-25 10:52:14 UTC (rev 1569)
+++ jcr/trunk/applications/java/exo.jcr.applications.backupconsole/bin/jcrbackup.sh 2010-01-25 10:54:00 UTC (rev 1570)
@@ -1,3 +1,3 @@
#!/bin/sh
-java -jar exo.jcr.applications.backupconsole-1.12.0-Beta06-SNAPSHOT.jar $*
+java -jar exo.jcr.applications.backupconsole-1.12.0-CR1-SNAPSHOT.jar $*
14 years, 3 months
exo-jcr SVN: r1569 - jcr/trunk/applications.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-01-25 05:52:14 -0500 (Mon, 25 Jan 2010)
New Revision: 1569
Modified:
jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml
jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml
jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-407 exo dependencies versions updated
Modified: jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml 2010-01-25 10:51:09 UTC (rev 1568)
+++ jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml 2010-01-25 10:52:14 UTC (rev 1569)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-Beta06-SNAPSHOT</version>
+ <version>1.12.0-CR1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.0-Beta06-SNAPSHOT</version>
+ <version>1.12.0-CR1-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml 2010-01-25 10:51:09 UTC (rev 1568)
+++ jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml 2010-01-25 10:52:14 UTC (rev 1569)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-Beta06-SNAPSHOT</version>
+ <version>1.12.0-CR1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.0-Beta06-SNAPSHOT</version>
+ <version>1.12.0-CR1-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-01-25 10:51:09 UTC (rev 1568)
+++ jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-01-25 10:52:14 UTC (rev 1569)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.0-Beta06-SNAPSHOT</version>
+ <version>1.12.0-CR1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -102,4 +102,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
14 years, 3 months
exo-jcr SVN: r1568 - jcr/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-01-25 05:51:09 -0500 (Mon, 25 Jan 2010)
New Revision: 1568
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-407 exo dependencies versions updated
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-01-25 10:27:47 UTC (rev 1567)
+++ jcr/trunk/pom.xml 2010-01-25 10:51:09 UTC (rev 1568)
@@ -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-Beta06</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta06</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-Beta06</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.0-CR1-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-CR1-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.0-CR1-SNAPSHOT</org.exoplatform.ws.version>
</properties>
<scm>
14 years, 3 months
exo-jcr SVN: r1567 - ws/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-01-25 05:27:47 -0500 (Mon, 25 Jan 2010)
New Revision: 1567
Modified:
ws/trunk/pom.xml
Log:
EXOJCR-407 exo dependencies versions updated
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2010-01-25 09:00:49 UTC (rev 1566)
+++ ws/trunk/pom.xml 2010-01-25 10:27:47 UTC (rev 1567)
@@ -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-Beta06</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta06</org.exoplatform.core.version>
+ <org.exoplatform.kernel.version>2.2.0-CR1-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-CR1-SNAPSHOT</org.exoplatform.core.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
14 years, 3 months