exo-jcr SVN: r3238 - in kernel/trunk/exo.kernel.container/src: test/java/org/exoplatform/container/configuration and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-10-04 10:48:42 -0400 (Mon, 04 Oct 2010)
New Revision: 3238
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java
Log:
EXOJCR-988: StandaloneContainer.initConfigurationURL fixed
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-10-04 14:39:54 UTC (rev 3237)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-10-04 14:48:42 UTC (rev 3238)
@@ -332,12 +332,13 @@
J2EEServerInfo env = new J2EEServerInfo();
// (2) exo-configuration.xml in AS (standalone) home directory
- configurationURL = new URL("file:" + env.getServerHome() + "/exo-configuration.xml");
+ configurationURL = (new File(env.getServerHome() + "/exo-configuration.xml")).toURI().toURL();
// (3) AS_HOME/conf/exo-conf (JBossAS usecase)
if (!fileExists(configurationURL))
{
- configurationURL = new URL("file:" + env.getExoConfigurationDirectory() + "/exo-configuration.xml");
+ configurationURL =
+ (new File(env.getExoConfigurationDirectory() + "/exo-configuration.xml")).toURI().toURL();
}
// (4) conf/exo-configuration.xml in war/ear(?)
Modified: kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java 2010-10-04 14:39:54 UTC (rev 3237)
+++ kernel/trunk/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java 2010-10-04 14:48:42 UTC (rev 3238)
@@ -1,441 +1,467 @@
-/*
- * Copyright (C) 2003-2010 eXo Platform SAS.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
- */
-package org.exoplatform.container.configuration;
-
-import junit.framework.TestCase;
-
-import org.exoplatform.container.xml.Configuration;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Set;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-/**
- * Created by The eXo Platform SAS
- * Author : Nicolas Filotto
- * nicolas.filotto(a)exoplatform.com
- * 22 f�vr. 2010
- */
-public class TestConfigurationManagerImpl extends TestCase
-{
- public void testGetURL() throws Exception
- {
- // Empty CM
- ConfigurationManager cm = new ConfigurationManagerImpl();
- URL url = cm.getURL(null);
- assertNull(url);
- url = cm.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- try
- {
- url = cm.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
- fail("An error should be thrown");
- }
- catch (Exception e)
- {
- // ok;
- }
- try
- {
- url = cm.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
- fail("An error should be thrown");
- }
- catch (Exception e)
- {
- // ok;
- }
- String sURL = getClass().getResource("empty-config.xml").toString();
- assertNotNull(sURL);
- assertTrue("the expected path should starts with file:", sURL.startsWith("file:"));
- sURL = sURL.substring(0, sURL.lastIndexOf('/'));
- sURL = sURL.substring(0, sURL.lastIndexOf('/'));
- url = cm.getURL(sURL + "/configuration/empty-config.xml");
- checkURL(url);
- url = cm.getURL(sURL + "/configuration/empty-config-fake.xml");
- checkURL(url, true);
- url = cm.getURL(sURL + "\\configuration\\empty-config.xml");
- checkURL(url);
- url = cm.getURL(sURL + "\\configuration\\empty-config-fake.xml");
- checkURL(url, true);
- String incompleteURL = "file:/" + getClass().getResource("empty-config.xml").getPath();
- incompleteURL = incompleteURL.substring(0, incompleteURL.lastIndexOf('/'));
- url = cm.getURL(incompleteURL + "/empty-config.xml");
- checkURL(url);
- url = cm.getURL(incompleteURL + "/empty-config-fake.xml");
- checkURL(url, true);
- incompleteURL = "file:" + getClass().getResource("empty-config.xml").getPath();
- incompleteURL = incompleteURL.substring(0, incompleteURL.lastIndexOf('/'));
- url = cm.getURL(incompleteURL + "/empty-config.xml");
- checkURL(url);
- url = cm.getURL(incompleteURL + "/empty-config-fake.xml");
- checkURL(url, true);
- url = cm.getURL("org/exoplatform/container/configuration/empty-config.xml");
- assertNull(url);
- url = cm.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
-
- // CM with ClassLoader
- ConfigurationManager cm1 = new ConfigurationManagerImpl(Thread.currentThread().getContextClassLoader(), null);
- url = cm1.getURL(null);
- assertNull(url);
- url = cm1.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm1.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm1.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm1.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm1.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm1.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm1.getURL(sURL + "/configuration/empty-config.xml");
- checkURL(url);
- url = cm1.getURL(sURL + "/configuration/empty-config-fake.xml");
- checkURL(url, true);
- url = cm1.getURL("org/exoplatform/container/configuration/empty-config.xml");
- assertNull(url);
- url = cm1.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
-
- // CM with ServletContext
- ConfigurationManager cm2 = new ConfigurationManagerImpl(new MockServletContext(), null);
- url = cm2.getURL(null);
- assertNull(url);
- url = cm2.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm2.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm2.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm2.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm2.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm2.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm2.getURL(sURL + "/configuration/empty-config.xml");
- checkURL(url);
- url = cm2.getURL(sURL + "/configuration/empty-config-fake.xml");
- checkURL(url, true);
- url = cm2.getURL("org/exoplatform/container/configuration/empty-config.xml");
- assertNull(url);
- url = cm2.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
-
- // CM with Context path
- ConfigurationManager cm3 = new ConfigurationManagerImpl();
- String path = getClass().getResource("empty-config.xml").getPath();
- assertNotNull(path);
- path = path.substring(0, path.lastIndexOf('/'));
- cm3.addConfiguration((new File(path)).toURI().toURL());
- url = cm3.getURL(null);
- assertNull(url);
- url = cm3.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm3.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- url = cm3.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
- checkURL(url);
- url = cm3.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
- assertNull(url);
- try
- {
- url = cm3.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
- fail("An error should be thrown");
- }
- catch (Exception e)
- {
- // ok;
- }
- try
- {
- url = cm3.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
- fail("An error should be thrown");
- }
- catch (Exception e)
- {
- // ok;
- }
- url = cm3.getURL(sURL + "/configuration/empty-config.xml");
- checkURL(url);
- url = cm3.getURL(sURL + "/configuration/empty-config-fake.xml");
- checkURL(url, true);
- url = cm3.getURL("configuration/empty-config.xml");
- checkURL(url);
- url = cm3.getURL("configuration/empty-config-fake.xml");
- checkURL(url, true);
- url = cm3.getURL("configuration\\empty-config.xml");
- checkURL(url);
- url = cm3.getURL("configuration\\empty-config-fake.xml");
- checkURL(url, true);
- }
-
- public void testImport() throws Exception
- {
- // no import
- ConfigurationManager cm = new ConfigurationManagerImpl();
- cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-a.xml");
- Configuration conf = cm.getConfiguration();
- assertNotNull(conf.getComponent("A"));
- assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
- assertNull(conf.getComponent("B"));
- assertNull(conf.getComponent("C"));
-
- // b import a
- cm = new ConfigurationManagerImpl();
- cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-b.xml");
- conf = cm.getConfiguration();
- assertNotNull(conf.getComponent("A"));
- assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
- assertNotNull(conf.getComponent("B"));
- assertTrue(conf.getComponent("B").getDocumentURL().getFile().endsWith("config-manager-configuration-b.xml"));
- assertNull(conf.getComponent("C"));
-
- // c import b and b import a
- cm = new ConfigurationManagerImpl();
- cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-c.xml");
- conf = cm.getConfiguration();
- assertNotNull(conf.getComponent("A"));
- assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
- assertNotNull(conf.getComponent("B"));
- assertTrue(conf.getComponent("B").getDocumentURL().getFile().endsWith("config-manager-configuration-b.xml"));
- assertNotNull(conf.getComponent("C"));
- assertTrue(conf.getComponent("C").getDocumentURL().getFile().endsWith("config-manager-configuration-c.xml"));
- }
-
- private void checkURL(URL url) throws Exception
- {
- checkURL(url, false);
- }
-
- private void checkURL(URL url, boolean empty) throws Exception
- {
- assertNotNull(url);
- InputStream is = null;
- try
- {
- is = url.openStream();
- if (empty)
- {
- assertNull(is);
- }
- else
- {
- assertNotNull(is);
- assertTrue(is.available() > 0);
- }
- }
- catch (IOException e)
- {
- if (empty)
- {
- // OK
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- if (is != null)
- {
- try
- {
- is.close();
- }
- catch (Exception e)
- {
- // ignore me
- }
- }
- }
- }
-
- private static class MockServletContext implements ServletContext
- {
-
- public Object getAttribute(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration getAttributeNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ServletContext getContext(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getContextPath()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getInitParameter(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration getInitParameterNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getMajorVersion()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getMimeType(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getMinorVersion()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public RequestDispatcher getNamedDispatcher(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getRealPath(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public RequestDispatcher getRequestDispatcher(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public URL getResource(String arg0) throws MalformedURLException
- {
- // We remove "/WEB-INF/
- String path = arg0.substring(ConfigurationManagerImpl.WAR_CONF_LOCATION.length() + 1);
- return Thread.currentThread().getContextClassLoader().getResource(path);
- }
-
- public InputStream getResourceAsStream(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Set getResourcePaths(String arg0)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServerInfo()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Servlet getServlet(String arg0) throws ServletException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getServletContextName()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration getServletNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration getServlets()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void log(String arg0)
- {
- // TODO Auto-generated method stub
-
- }
-
- public void log(Exception arg0, String arg1)
- {
- // TODO Auto-generated method stub
-
- }
-
- public void log(String arg0, Throwable arg1)
- {
- // TODO Auto-generated method stub
-
- }
-
- public void removeAttribute(String arg0)
- {
- // TODO Auto-generated method stub
-
- }
-
- public void setAttribute(String arg0, Object arg1)
- {
- // TODO Auto-generated method stub
-
- }
-
- }
-}
+/*
+ * Copyright (C) 2003-2010 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.container.configuration;
+
+import junit.framework.TestCase;
+
+import org.exoplatform.container.xml.Configuration;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+/**
+ * Created by The eXo Platform SAS
+ * Author : Nicolas Filotto
+ * nicolas.filotto(a)exoplatform.com
+ * 22 f�vr. 2010
+ */
+public class TestConfigurationManagerImpl extends TestCase
+{
+ public void testGetURL() throws Exception
+ {
+ // Empty CM
+ ConfigurationManager cm = new ConfigurationManagerImpl();
+ URL url = cm.getURL(null);
+ assertNull(url);
+ url = cm.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ try
+ {
+ url = cm.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
+ fail("An error should be thrown");
+ }
+ catch (Exception e)
+ {
+ // ok;
+ }
+ try
+ {
+ url = cm.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ fail("An error should be thrown");
+ }
+ catch (Exception e)
+ {
+ // ok;
+ }
+ String sURL = getClass().getResource("empty-config.xml").toString();
+ assertNotNull(sURL);
+ assertTrue("the expected path should starts with file:", sURL.startsWith("file:"));
+ sURL = sURL.substring(0, sURL.lastIndexOf('/'));
+ sURL = sURL.substring(0, sURL.lastIndexOf('/'));
+ url = cm.getURL(sURL + "/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm.getURL(sURL + "/configuration/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm.getURL(sURL + "\\configuration\\empty-config.xml");
+ checkURL(url);
+ url = cm.getURL(sURL + "\\configuration\\empty-config-fake.xml");
+ checkURL(url, true);
+ String incompleteURL = "file:/" + getClass().getResource("empty-config.xml").getPath();
+ incompleteURL = incompleteURL.substring(0, incompleteURL.lastIndexOf('/'));
+ url = cm.getURL(incompleteURL + "/empty-config.xml");
+ checkURL(url);
+ url = cm.getURL(incompleteURL + "/empty-config-fake.xml");
+ checkURL(url, true);
+ incompleteURL = "file:" + getClass().getResource("empty-config.xml").getPath();
+ incompleteURL = incompleteURL.substring(0, incompleteURL.lastIndexOf('/'));
+ url = cm.getURL(incompleteURL + "/empty-config.xml");
+ checkURL(url);
+ url = cm.getURL(incompleteURL + "/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm.getURL("org/exoplatform/container/configuration/empty-config.xml");
+ assertNull(url);
+ url = cm.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+
+ // CM with ClassLoader
+ ConfigurationManager cm1 = new ConfigurationManagerImpl(Thread.currentThread().getContextClassLoader(), null);
+ url = cm1.getURL(null);
+ assertNull(url);
+ url = cm1.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm1.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm1.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm1.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm1.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm1.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm1.getURL(sURL + "/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm1.getURL(sURL + "/configuration/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm1.getURL("org/exoplatform/container/configuration/empty-config.xml");
+ assertNull(url);
+ url = cm1.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+
+ // CM with ServletContext
+ ConfigurationManager cm2 = new ConfigurationManagerImpl(new MockServletContext(), null);
+ url = cm2.getURL(null);
+ assertNull(url);
+ url = cm2.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm2.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm2.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm2.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm2.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm2.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm2.getURL(sURL + "/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm2.getURL(sURL + "/configuration/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm2.getURL("org/exoplatform/container/configuration/empty-config.xml");
+ assertNull(url);
+ url = cm2.getURL("org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+
+ // CM with Context path
+ ConfigurationManager cm3 = new ConfigurationManagerImpl();
+ String path = getClass().getResource("empty-config.xml").getPath();
+ assertNotNull(path);
+ path = path.substring(0, path.lastIndexOf('/'));
+ cm3.addConfiguration((new File(path)).toURI().toURL());
+ url = cm3.getURL(null);
+ assertNull(url);
+ url = cm3.getURL("jar:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm3.getURL("jar:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ url = cm3.getURL("classpath:/org/exoplatform/container/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm3.getURL("classpath:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ assertNull(url);
+ try
+ {
+ url = cm3.getURL("war:/org/exoplatform/container/configuration/empty-config.xml");
+ fail("An error should be thrown");
+ }
+ catch (Exception e)
+ {
+ // ok;
+ }
+ try
+ {
+ url = cm3.getURL("war:/org/exoplatform/container/configuration/empty-config-fake.xml");
+ fail("An error should be thrown");
+ }
+ catch (Exception e)
+ {
+ // ok;
+ }
+ url = cm3.getURL(sURL + "/configuration/empty-config.xml");
+ checkURL(url);
+ url = cm3.getURL(sURL + "/configuration/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm3.getURL("configuration/empty-config.xml");
+ checkURL(url);
+ url = cm3.getURL("configuration/empty-config-fake.xml");
+ checkURL(url, true);
+ url = cm3.getURL("configuration\\empty-config.xml");
+ checkURL(url);
+ url = cm3.getURL("configuration\\empty-config-fake.xml");
+ checkURL(url, true);
+ }
+
+ public void testGetFileURL() throws Exception
+ {
+ // Empty CM
+ ConfigurationManager cm = new ConfigurationManagerImpl();
+ URL url = cm.getURL(null);
+ assertNull(url);
+ url = cm.getURL("file:F:\\somepath\\path\\configuration.xml");
+ assertEquals("file:/F:/somepath/path/configuration.xml", url.toString());
+
+ //make context configuration starting fith "file:D:..."
+ try
+ {
+ cm.addConfiguration("file:D:\\somepath\\config.xml");
+ }
+ catch (Exception e)
+ {
+ // thats is ok, because such config does not exists,
+ // but ConfigurationManagerInmp.contextPath going to be initialized
+ // thats all we need to reproduce bug.
+ }
+
+ // now lets check relative url
+ url = cm.getURL("configuration.xml");
+ assertEquals("file:/D:/somepath/configuration.xml", url.toString());
+ }
+
+ public void testImport() throws Exception
+ {
+ // no import
+ ConfigurationManager cm = new ConfigurationManagerImpl();
+ cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-a.xml");
+ Configuration conf = cm.getConfiguration();
+ assertNotNull(conf.getComponent("A"));
+ assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
+ assertNull(conf.getComponent("B"));
+ assertNull(conf.getComponent("C"));
+
+ // b import a
+ cm = new ConfigurationManagerImpl();
+ cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-b.xml");
+ conf = cm.getConfiguration();
+ assertNotNull(conf.getComponent("A"));
+ assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
+ assertNotNull(conf.getComponent("B"));
+ assertTrue(conf.getComponent("B").getDocumentURL().getFile().endsWith("config-manager-configuration-b.xml"));
+ assertNull(conf.getComponent("C"));
+
+ // c import b and b import a
+ cm = new ConfigurationManagerImpl();
+ cm.addConfiguration("classpath:/org/exoplatform/container/configuration/config-manager-configuration-c.xml");
+ conf = cm.getConfiguration();
+ assertNotNull(conf.getComponent("A"));
+ assertTrue(conf.getComponent("A").getDocumentURL().getFile().endsWith("config-manager-configuration-a.xml"));
+ assertNotNull(conf.getComponent("B"));
+ assertTrue(conf.getComponent("B").getDocumentURL().getFile().endsWith("config-manager-configuration-b.xml"));
+ assertNotNull(conf.getComponent("C"));
+ assertTrue(conf.getComponent("C").getDocumentURL().getFile().endsWith("config-manager-configuration-c.xml"));
+ }
+
+ private void checkURL(URL url) throws Exception
+ {
+ checkURL(url, false);
+ }
+
+ private void checkURL(URL url, boolean empty) throws Exception
+ {
+ assertNotNull(url);
+ InputStream is = null;
+ try
+ {
+ is = url.openStream();
+ if (empty)
+ {
+ assertNull(is);
+ }
+ else
+ {
+ assertNotNull(is);
+ assertTrue(is.available() > 0);
+ }
+ }
+ catch (IOException e)
+ {
+ if (empty)
+ {
+ // OK
+ }
+ else
+ {
+ throw e;
+ }
+ }
+ finally
+ {
+ if (is != null)
+ {
+ try
+ {
+ is.close();
+ }
+ catch (Exception e)
+ {
+ // ignore me
+ }
+ }
+ }
+ }
+
+ private static class MockServletContext implements ServletContext
+ {
+
+ public Object getAttribute(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Enumeration getAttributeNames()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public ServletContext getContext(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getContextPath()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getInitParameter(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Enumeration getInitParameterNames()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getMajorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public String getMimeType(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public int getMinorVersion()
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public RequestDispatcher getNamedDispatcher(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getRealPath(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public RequestDispatcher getRequestDispatcher(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public URL getResource(String arg0) throws MalformedURLException
+ {
+ // We remove "/WEB-INF/
+ String path = arg0.substring(ConfigurationManagerImpl.WAR_CONF_LOCATION.length() + 1);
+ return Thread.currentThread().getContextClassLoader().getResource(path);
+ }
+
+ public InputStream getResourceAsStream(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Set getResourcePaths(String arg0)
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServerInfo()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Servlet getServlet(String arg0) throws ServletException
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServletContextName()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Enumeration getServletNames()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Enumeration getServlets()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void log(String arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void log(Exception arg0, String arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void log(String arg0, Throwable arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void removeAttribute(String arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setAttribute(String arg0, Object arg1)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ }
+}
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3237 - in kernel/branches/2.2.x/exo.kernel.container/src: test/java/org/exoplatform/container/configuration and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-10-04 10:39:54 -0400 (Mon, 04 Oct 2010)
New Revision: 3237
Modified:
kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java
Log:
JCR-1466: StandaloneContainer.initConfigurationURL fixed
Modified: kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-10-04 14:01:54 UTC (rev 3236)
+++ kernel/branches/2.2.x/exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2010-10-04 14:39:54 UTC (rev 3237)
@@ -332,12 +332,13 @@
J2EEServerInfo env = new J2EEServerInfo();
// (2) exo-configuration.xml in AS (standalone) home directory
- configurationURL = new URL("file:" + env.getServerHome() + "/exo-configuration.xml");
+ configurationURL = (new File(env.getServerHome() + "/exo-configuration.xml")).toURI().toURL();
// (3) AS_HOME/conf/exo-conf (JBossAS usecase)
if (!fileExists(configurationURL))
{
- configurationURL = new URL("file:" + env.getExoConfigurationDirectory() + "/exo-configuration.xml");
+ configurationURL =
+ (new File(env.getExoConfigurationDirectory() + "/exo-configuration.xml")).toURI().toURL();
}
// (4) conf/exo-configuration.xml in war/ear(?)
Modified: kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java
===================================================================
--- kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java 2010-10-04 14:01:54 UTC (rev 3236)
+++ kernel/branches/2.2.x/exo.kernel.container/src/test/java/org/exoplatform/container/configuration/TestConfigurationManagerImpl.java 2010-10-04 14:39:54 UTC (rev 3237)
@@ -198,7 +198,33 @@
url = cm3.getURL("configuration\\empty-config-fake.xml");
checkURL(url, true);
}
+
+ public void testGetFileURL() throws Exception
+ {
+ // Empty CM
+ ConfigurationManager cm = new ConfigurationManagerImpl();
+ URL url = cm.getURL(null);
+ assertNull(url);
+ url = cm.getURL("file:F:\\somepath\\path\\configuration.xml");
+ assertEquals("file:/F:/somepath/path/configuration.xml", url.toString());
+ //make context configuration starting fith "file:D:..."
+ try
+ {
+ cm.addConfiguration("file:D:\\somepath\\config.xml");
+ }
+ catch (Exception e)
+ {
+ // thats is ok, because such config does not exists,
+ // but ConfigurationManagerInmp.contextPath going to be initialized
+ // thats all we need to reproduce bug.
+ }
+
+ // now lets check relative url
+ url = cm.getURL("configuration.xml");
+ assertEquals("file:/D:/somepath/configuration.xml", url.toString());
+ }
+
private void checkURL(URL url) throws Exception
{
checkURL(url, false);
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3236 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-04 10:01:54 -0400 (Mon, 04 Oct 2010)
New Revision: 3236
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
Log:
EXOJCR-971: prevent unauthorized access to the methods of RepositoryServiceImpl
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-10-04 11:16:53 UTC (rev 3235)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2010-10-04 14:01:54 UTC (rev 3236)
@@ -30,6 +30,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.security.JCRRuntimePermissions;
import org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
@@ -43,8 +44,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.StringTokenizer;
-import java.util.Map.Entry;
import javax.jcr.RepositoryException;
@@ -120,6 +121,13 @@
public synchronized void createRepository(RepositoryEntry rEntry) throws RepositoryConfigurationException,
RepositoryException
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
if (repositoryContainers.containsKey(rEntry.getName()))
{
throw new RepositoryConfigurationException("Repository container " + rEntry.getName() + " already started");
@@ -161,6 +169,13 @@
public RepositoryServiceConfiguration getConfig()
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
return config;
}
@@ -207,6 +222,13 @@
public void setCurrentRepositoryName(String repositoryName) throws RepositoryConfigurationException
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
if (!repositoryContainers.containsKey(repositoryName))
throw new RepositoryConfigurationException("Repository is not configured. Name " + repositoryName);
currentRepositoryName.set(repositoryName);
@@ -214,6 +236,13 @@
public void start()
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
try
{
ExoContainer container = null;
@@ -246,6 +275,13 @@
public void stop()
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
for (Entry<String, RepositoryContainer> entry : repositoryContainers.entrySet())
{
entry.getValue().stop();
@@ -351,6 +387,13 @@
*/
private void removeRepository(String name, boolean allowRemoveDefaultRepository) throws RepositoryException
{
+ // Need privileges to manage repository.
+ SecurityManager security = System.getSecurityManager();
+ if (security != null)
+ {
+ security.checkPermission(JCRRuntimePermissions.MANAGE_REPOSITORY_PERMISSION);
+ }
+
if (!canRemoveRepository(name, allowRemoveDefaultRepository))
throw new RepositoryException("Repository " + name + " in use. If you want to "
+ " remove repository close all open sessions");
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3235 - in jcr/branches/1.14-CNK: applications and 24 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-04 07:16:53 -0400 (Mon, 04 Oct 2010)
New Revision: 3235
Modified:
jcr/branches/1.14-CNK/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.jetty/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.14-CNK/applications/exo.jcr.ear/pom.xml
jcr/branches/1.14-CNK/applications/pom.xml
jcr/branches/1.14-CNK/exo.jcr.component.core/pom.xml
jcr/branches/1.14-CNK/exo.jcr.component.ext/pom.xml
jcr/branches/1.14-CNK/exo.jcr.component.ftp/pom.xml
jcr/branches/1.14-CNK/exo.jcr.component.statistics/pom.xml
jcr/branches/1.14-CNK/exo.jcr.component.webdav/pom.xml
jcr/branches/1.14-CNK/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.14-CNK/exo.jcr.docs/pom.xml
jcr/branches/1.14-CNK/exo.jcr.framework.command/pom.xml
jcr/branches/1.14-CNK/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.14-CNK/exo.jcr.framework.web/pom.xml
jcr/branches/1.14-CNK/packaging/module/pom.xml
jcr/branches/1.14-CNK/pom.xml
Log:
EXOJCR-987: prepare branch 1.14-CNK
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.backupconsole/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.backupconsole/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.browser/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.browser/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.config/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.config/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.fckeditor/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.fckeditor/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.jboss/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.jboss/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.jetty/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.jetty/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.jetty/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.jonas/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.jonas/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.rest/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.rest/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.applications.tomcat/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.applications.tomcat/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.cluster.testclient/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.cluster.testclient/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.14-CNK/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/exo.jcr.ear/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/exo.jcr.ear/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.14-CNK/applications/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/applications/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/applications/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-CNK/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.component.core/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.component.core/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.component.ext/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.component.ext/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.component.ftp/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.component.ftp/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.component.statistics/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.component.statistics/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.component.webdav/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.component.webdav/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.connectors.localadapter/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.connectors.localadapter/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-CNK/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.docs/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.docs/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.14-CNK/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.framework.command/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.framework.command/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.framework.ftpclient/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.framework.ftpclient/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.14-CNK/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/exo.jcr.framework.web/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/exo.jcr.framework.web/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.14-CNK/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/packaging/module/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/packaging/module/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.14-CNK/pom.xml
===================================================================
--- jcr/branches/1.14-CNK/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
+++ jcr/branches/1.14-CNK/pom.xml 2010-10-04 11:16:53 UTC (rev 3235)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
+ <version>1.14-CNK-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3234 - in jcr/branches: 1.14-CNK and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-04 06:38:19 -0400 (Mon, 04 Oct 2010)
New Revision: 3234
Added:
jcr/branches/1.14-CNK/
jcr/branches/1.14-CNK/pom.xml
Removed:
jcr/branches/1.14-CNK/pom.xml
Log:
[maven-release-plugin] copy for branch 1.14-CNK
Copied: jcr/branches/1.14-CNK (from rev 3232, jcr/tags/1.14.0-Beta02)
Deleted: jcr/branches/1.14-CNK/pom.xml
===================================================================
--- jcr/tags/1.14.0-Beta02/pom.xml 2010-10-04 08:34:24 UTC (rev 3232)
+++ jcr/branches/1.14-CNK/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<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>7</version>
- </parent>
-
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>jcr-parent</artifactId>
- <version>1.14.0-Beta02</version>
- <packaging>pom</packaging>
- <name>eXo JCR</name>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-Beta02</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-Beta02</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.0-Beta02</url>
- </scm>
-
- <properties>
- <exo.product.name>exo-jcr</exo.product.name>
- <exo.product.specification>1.14</exo.product.specification>
- <org.exoplatform.kernel.version>2.3.0-Beta02</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.4.0-Beta02</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.2.0-Beta02</org.exoplatform.ws.version>
- <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
- </properties>
-
- <dependencyManagement>
- <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.commons.test</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
- <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.component.ext</artifactId>
- <version>${project.version}</version>
- </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.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>
- <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.web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.framework.ftpclient</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.cluster.testclient</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.applications.fckeditor</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.applications.browser</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.applications.rest</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.connectors.localadapter</artifactId>
- <type>rar</type>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-run</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <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>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>1.0.1B</version>
- </dependency>
- <dependency>
- <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>
- <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.2</version>
- <exclusions>
- <exclusion>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</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>
- <classifier>sources</classifier>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.7</version>
- </dependency>
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>2.6.13.GA</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.7</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- <version>3.2.6.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossjts</artifactId>
- <version>4.6.1.GA</version>
- </dependency>
- <dependency>
- <groupId>jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.6.1.GA</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.8</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- <include>**/*.properties</include>
- <include>**/*.ion</include>
- <include>**/*.conf</include>
- <include>**/*.config</include>
- </includes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsl</include>
- <include>**/*.properties</include>
- <include>**/login.conf</include>
- <include>**/*.ion</include>
- <include>**/*.conf</include>
- <include>**/*.config</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.txt</include>
- <include>**/*.conf</include>
- <include>**/*.config</include>
- </includes>
- </testResource>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.txt</include>
- <include>**/*.conf</include>
- <include>**/*.config</include>
- </includes>
- </testResource>
- </testResources>
- </build>
- <modules>
- <module>exo.jcr.component.core</module>
- <module>exo.jcr.component.statistics</module>
- <module>exo.jcr.component.ext</module>
- <module>exo.jcr.component.ftp</module>
- <module>exo.jcr.component.webdav</module>
- <module>exo.jcr.connectors.localadapter</module>
- <module>exo.jcr.framework.command</module>
- <module>exo.jcr.framework.web</module>
- <module>exo.jcr.framework.ftpclient</module>
- <module>applications</module>
- <module>exo.jcr.docs</module>
- <module>packaging/module</module>
- </modules>
-</project>
Copied: jcr/branches/1.14-CNK/pom.xml (from rev 3233, jcr/tags/1.14.0-Beta02/pom.xml)
===================================================================
--- jcr/branches/1.14-CNK/pom.xml (rev 0)
+++ jcr/branches/1.14-CNK/pom.xml 2010-10-04 10:38:19 UTC (rev 3234)
@@ -0,0 +1,471 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<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>7</version>
+ </parent>
+
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>jcr-parent</artifactId>
+ <version>1.14.0-Beta02</version>
+ <packaging>pom</packaging>
+ <name>eXo JCR</name>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14-CNK</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14-CNK</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14-CNK</url>
+ </scm>
+
+ <properties>
+ <exo.product.name>exo-jcr</exo.product.name>
+ <exo.product.specification>1.14</exo.product.specification>
+ <org.exoplatform.kernel.version>2.3.0-Beta02</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.4.0-Beta02</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.2.0-Beta02</org.exoplatform.ws.version>
+ <org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
+ </properties>
+
+ <dependencyManagement>
+ <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.commons.test</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <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.component.ext</artifactId>
+ <version>${project.version}</version>
+ </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.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>
+ <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.web</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.framework.ftpclient</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.cluster.testclient</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.applications.fckeditor</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.applications.browser</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.applications.rest</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.connectors.localadapter</artifactId>
+ <type>rar</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.0.b2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <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>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ </dependency>
+ <dependency>
+ <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>
+ <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.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>1.1.3.4.O</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</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>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>2.6.13.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ <version>3.2.6.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossjts</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ <version>4.6.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.6.8</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.properties</include>
+ <include>**/*.ion</include>
+ <include>**/*.conf</include>
+ <include>**/*.config</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.xsl</include>
+ <include>**/*.properties</include>
+ <include>**/login.conf</include>
+ <include>**/*.ion</include>
+ <include>**/*.conf</include>
+ <include>**/*.config</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.txt</include>
+ <include>**/*.conf</include>
+ <include>**/*.config</include>
+ </includes>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*.txt</include>
+ <include>**/*.conf</include>
+ <include>**/*.config</include>
+ </includes>
+ </testResource>
+ </testResources>
+ </build>
+ <modules>
+ <module>exo.jcr.component.core</module>
+ <module>exo.jcr.component.statistics</module>
+ <module>exo.jcr.component.ext</module>
+ <module>exo.jcr.component.ftp</module>
+ <module>exo.jcr.component.webdav</module>
+ <module>exo.jcr.connectors.localadapter</module>
+ <module>exo.jcr.framework.command</module>
+ <module>exo.jcr.framework.web</module>
+ <module>exo.jcr.framework.ftpclient</module>
+ <module>applications</module>
+ <module>exo.jcr.docs</module>
+ <module>packaging/module</module>
+ </modules>
+</project>
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3233 - jcr/tags/1.14.0-Beta02.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-04 06:38:01 -0400 (Mon, 04 Oct 2010)
New Revision: 3233
Modified:
jcr/tags/1.14.0-Beta02/pom.xml
Log:
[maven-release-plugin] prepare branch 1.14-CNK
Modified: jcr/tags/1.14.0-Beta02/pom.xml
===================================================================
--- jcr/tags/1.14.0-Beta02/pom.xml 2010-10-04 08:34:24 UTC (rev 3232)
+++ jcr/tags/1.14.0-Beta02/pom.xml 2010-10-04 10:38:01 UTC (rev 3233)
@@ -34,9 +34,9 @@
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-Beta02</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.14.0-Beta02</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.14.0-Beta02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.14-CNK</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.14-CNK</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.14-CNK</url>
</scm>
<properties>
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3232 - in jcr/branches/1.12.x/exo.jcr.component.webdav/src: test/java/org/exoplatform/services/jcr/webdav/command and 1 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-10-04 04:34:24 -0400 (Mon, 04 Oct 2010)
New Revision: 3232
Added:
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/test.txt
Modified:
jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java
Log:
JCR-1467: applying the patch
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-10-01 10:14:43 UTC (rev 3231)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-10-04 08:34:24 UTC (rev 3232)
@@ -222,7 +222,15 @@
}
else if (name.equals(GETLASTMODIFIED))
{
- Calendar modified = contentNode().getProperty("jcr:lastModified").getDate();
+ Calendar modified;
+ try
+ {
+ modified = contentNode().getProperty("jcr:lastModified").getDate();
+ }
+ catch (PathNotFoundException e)
+ {
+ modified = node.getProperty("jcr:created").getDate();
+ }
HierarchicalProperty lastModified = new HierarchicalProperty(name, modified, MODIFICATION_PATTERN);
lastModified.setAttribute("b:dt", "dateTime.rfc1123");
return lastModified;
@@ -268,7 +276,9 @@
return lockDiscovery(token, owner, "86400");
}
else
+ {
throw new PathNotFoundException();
+ }
}
else if (name.equals(ISVERSIONED))
{
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java 2010-10-01 10:14:43 UTC (rev 3231)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java 2010-10-04 08:34:24 UTC (rev 3232)
@@ -19,18 +19,28 @@
package org.exoplatform.services.jcr.webdav.command;
import org.exoplatform.common.http.HTTPStatus;
+import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
+import org.exoplatform.services.jcr.impl.core.version.VersionImpl;
import org.exoplatform.services.jcr.webdav.BaseStandaloneTest;
import org.exoplatform.services.jcr.webdav.WebDavConstants.WebDAVMethods;
import org.exoplatform.services.jcr.webdav.utils.TestUtils;
+import org.exoplatform.services.rest.ext.provider.XSLTStreamingOutput;
import org.exoplatform.services.rest.impl.ContainerResponse;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringWriter;
+import java.util.Calendar;
+import javax.jcr.Node;
+
/**
* Created by The eXo Platform SAS Author : Dmytro Katayev
* work.visor.ck(a)gmail.com Aug 13, 2008
@@ -59,17 +69,61 @@
StringWriter sw = new StringWriter();
char[] buffer = new char[1024];
for (int n; (n = r.read(buffer)) != -1;)
+ {
sw.write(buffer, 0, n);
+ }
String str = sw.toString();
assertEquals(fileContent, str);
}
-
+
public void testNotFoundGet() throws Exception
{
ContainerResponse response = service(WebDAVMethods.GET, getPathWS() + "/not-found" + path, "", null, null);
assertEquals(HTTPStatus.NOT_FOUND, response.getStatus());
}
+ /**
+ * Details can be found here: https://jira.jboss.org/browse/EXOJCR-956
+ * @throws Exception
+ */
+ public void testMissingJcrLastModifiedProperty() throws Exception
+ {
+ File file = new File("src/test/resources/rh_nodetype.xml");
+ assertTrue("src/test/resources/rh_nodetype.xml not found", file.exists());
+ FileInputStream fis = new FileInputStream(file);
+
+ session.getWorkspace().getNamespaceRegistry().registerNamespace("rh", "www.vn.vnn");
+ session.getWorkspace().getNodeTypesHolder().registerNodeTypes(fis, ExtendedNodeTypeManager.IGNORE_IF_EXISTS,
+ NodeTypeDataManager.TEXT_XML);
+
+ Node podcast = session.getRootNode().addNode("podcast", "rh:podcast");
+
+ Node nodeToAdd = podcast.addNode("rh:podcastFile", "nt:file");
+ Node contentNodeOfNodeToAdd = nodeToAdd.addNode("jcr:content", "nt:resource");
+ contentNodeOfNodeToAdd.setProperty("jcr:data", new FileInputStream("src/test/resources/test.txt"));
+ contentNodeOfNodeToAdd.setProperty("jcr:mimeType", "text/plain");
+ contentNodeOfNodeToAdd.setProperty("jcr:lastModified", Calendar.getInstance());
+ session.save();
+
+ podcast.addMixin("mix:versionable");
+ session.save();
+
+ VersionImpl v = (VersionImpl)podcast.checkin();
+ session.save();
+
+ podcast.checkout();
+ session.save();
+
+ String path =
+ getPathWS() + "/jcr:system/jcr:versionStorage/" + v.getContainingHistory().getIdentifier()
+ + "/1/jcr:frozenNode/rh:podcastFile";
+
+ ContainerResponse response = service(WebDAVMethods.GET, path, "", null, null);
+ assertEquals("Successful result expected (200), but actual is: " + response.getStatus(), 200, response
+ .getStatus());
+
+ }
+
@Override
protected String getRepositoryName()
{
Added: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml 2010-10-04 08:34:24 UTC (rev 3232)
@@ -0,0 +1,52 @@
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.5" xmlns:mix="http://www.jcp.org/jcr/mix/1.5" xmlns:jcr="http://www.jcp.org/jcr/1.5" >
+<nodeType name="rh:podcast" isMixin="false" hasOrderableChildNodes="false" primaryItemName="" >
+<supertypes>
+<supertype>nt:base</supertype>
+</supertypes>
+<propertyDefinitions>
+<propertyDefinition name="jcr:primaryType" requiredType="Name" autoCreated="true" mandatory="true" onParentVersion="COMPUTE" protected="true" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:publishedDate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:author" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="jcr:created" requiredType="Date" autoCreated="true" mandatory="false" onParentVersion="INITIALIZE" protected="true" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:length" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:keywords" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:link" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:explicit" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:title" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="jcr:mixinTypes" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="true" multiple="true" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:podcastCategory" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+</propertyDefinitions>
+<childNodeDefinitions>
+<childNodeDefinition name="rh:podcastFile" defaultPrimaryType="nt:file" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" sameNameSiblings="false" >
+<requiredPrimaryTypes>
+<requiredPrimaryType>nt:file</requiredPrimaryType>
+</requiredPrimaryTypes>
+</childNodeDefinition>
+</childNodeDefinitions>
+</nodeType>
+</nodeTypes>
\ No newline at end of file
Property changes on: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/test.txt
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/test.txt (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/test.txt 2010-10-04 08:34:24 UTC (rev 3232)
@@ -0,0 +1,3 @@
+hello
+its a little text file for server tests
+Here is all right, I suppose :^)
\ No newline at end of file
Property changes on: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/test.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3231 - in jcr/trunk/exo.jcr.component.webdav/src: test/java/org/exoplatform/services/jcr/webdav/command and 1 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2010-10-01 06:14:43 -0400 (Fri, 01 Oct 2010)
New Revision: 3231
Added:
jcr/trunk/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
jcr/trunk/exo.jcr.component.webdav/src/test/resources/test.txt
Modified:
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java
jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java
Log:
EXOJCR-956 : Returning creation date if last modified date is missing.
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-10-01 09:12:11 UTC (rev 3230)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/resource/FileResource.java 2010-10-01 10:14:43 UTC (rev 3231)
@@ -222,7 +222,15 @@
}
else if (name.equals(GETLASTMODIFIED))
{
- Calendar modified = contentNode().getProperty("jcr:lastModified").getDate();
+ Calendar modified;
+ try
+ {
+ modified = contentNode().getProperty("jcr:lastModified").getDate();
+ }
+ catch (PathNotFoundException e)
+ {
+ modified = node.getProperty("jcr:created").getDate();
+ }
HierarchicalProperty lastModified = new HierarchicalProperty(name, modified, MODIFICATION_PATTERN);
lastModified.setAttribute("b:dt", "dateTime.rfc1123");
return lastModified;
@@ -268,7 +276,9 @@
return lockDiscovery(token, owner, "86400");
}
else
+ {
throw new PathNotFoundException();
+ }
}
else if (name.equals(ISVERSIONED))
{
Modified: jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java 2010-10-01 09:12:11 UTC (rev 3230)
+++ jcr/trunk/exo.jcr.component.webdav/src/test/java/org/exoplatform/services/jcr/webdav/command/TestGet.java 2010-10-01 10:14:43 UTC (rev 3231)
@@ -19,18 +19,28 @@
package org.exoplatform.services.jcr.webdav.command;
import org.exoplatform.common.http.HTTPStatus;
+import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
+import org.exoplatform.services.jcr.impl.core.version.VersionImpl;
import org.exoplatform.services.jcr.webdav.BaseStandaloneTest;
import org.exoplatform.services.jcr.webdav.WebDavConstants.WebDAVMethods;
import org.exoplatform.services.jcr.webdav.utils.TestUtils;
+import org.exoplatform.services.rest.ext.provider.XSLTStreamingOutput;
import org.exoplatform.services.rest.impl.ContainerResponse;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringWriter;
+import java.util.Calendar;
+import javax.jcr.Node;
+
/**
* Created by The eXo Platform SAS Author : Dmytro Katayev
* work.visor.ck(a)gmail.com Aug 13, 2008
@@ -59,17 +69,61 @@
StringWriter sw = new StringWriter();
char[] buffer = new char[1024];
for (int n; (n = r.read(buffer)) != -1;)
+ {
sw.write(buffer, 0, n);
+ }
String str = sw.toString();
assertEquals(fileContent, str);
}
-
+
public void testNotFoundGet() throws Exception
{
ContainerResponse response = service(WebDAVMethods.GET, getPathWS() + "/not-found" + path, "", null, null);
assertEquals(HTTPStatus.NOT_FOUND, response.getStatus());
}
+ /**
+ * Details can be found here: https://jira.jboss.org/browse/EXOJCR-956
+ * @throws Exception
+ */
+ public void testMissingJcrLastModifiedProperty() throws Exception
+ {
+ File file = new File("src/test/resources/rh_nodetype.xml");
+ assertTrue("src/test/resources/rh_nodetype.xml not found", file.exists());
+ FileInputStream fis = new FileInputStream(file);
+
+ session.getWorkspace().getNamespaceRegistry().registerNamespace("rh", "www.vn.vnn");
+ session.getWorkspace().getNodeTypesHolder().registerNodeTypes(fis, ExtendedNodeTypeManager.IGNORE_IF_EXISTS,
+ NodeTypeDataManager.TEXT_XML);
+
+ Node podcast = session.getRootNode().addNode("podcast", "rh:podcast");
+
+ Node nodeToAdd = podcast.addNode("rh:podcastFile", "nt:file");
+ Node contentNodeOfNodeToAdd = nodeToAdd.addNode("jcr:content", "nt:resource");
+ contentNodeOfNodeToAdd.setProperty("jcr:data", new FileInputStream("src/test/resources/test.txt"));
+ contentNodeOfNodeToAdd.setProperty("jcr:mimeType", "text/plain");
+ contentNodeOfNodeToAdd.setProperty("jcr:lastModified", Calendar.getInstance());
+ session.save();
+
+ podcast.addMixin("mix:versionable");
+ session.save();
+
+ VersionImpl v = (VersionImpl)podcast.checkin();
+ session.save();
+
+ podcast.checkout();
+ session.save();
+
+ String path =
+ getPathWS() + "/jcr:system/jcr:versionStorage/" + v.getContainingHistory().getIdentifier()
+ + "/1/jcr:frozenNode/rh:podcastFile";
+
+ ContainerResponse response = service(WebDAVMethods.GET, path, "", null, null);
+ assertEquals("Successful result expected (200), but actual is: " + response.getStatus(), 200, response
+ .getStatus());
+
+ }
+
@Override
protected String getRepositoryName()
{
Added: jcr/trunk/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml (rev 0)
+++ jcr/trunk/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml 2010-10-01 10:14:43 UTC (rev 3231)
@@ -0,0 +1,52 @@
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.5" xmlns:mix="http://www.jcp.org/jcr/mix/1.5" xmlns:jcr="http://www.jcp.org/jcr/1.5" >
+<nodeType name="rh:podcast" isMixin="false" hasOrderableChildNodes="false" primaryItemName="" >
+<supertypes>
+<supertype>nt:base</supertype>
+</supertypes>
+<propertyDefinitions>
+<propertyDefinition name="jcr:primaryType" requiredType="Name" autoCreated="true" mandatory="true" onParentVersion="COMPUTE" protected="true" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:publishedDate" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:author" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="jcr:created" requiredType="Date" autoCreated="true" mandatory="false" onParentVersion="INITIALIZE" protected="true" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:length" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:keywords" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:link" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:explicit" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:title" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="jcr:mixinTypes" requiredType="Name" autoCreated="false" mandatory="false" onParentVersion="COMPUTE" protected="true" multiple="true" >
+<valueConstraints/>
+</propertyDefinition>
+<propertyDefinition name="exo:podcastCategory" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false" >
+<valueConstraints/>
+</propertyDefinition>
+</propertyDefinitions>
+<childNodeDefinitions>
+<childNodeDefinition name="rh:podcastFile" defaultPrimaryType="nt:file" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" sameNameSiblings="false" >
+<requiredPrimaryTypes>
+<requiredPrimaryType>nt:file</requiredPrimaryType>
+</requiredPrimaryTypes>
+</childNodeDefinition>
+</childNodeDefinitions>
+</nodeType>
+</nodeTypes>
\ No newline at end of file
Property changes on: jcr/trunk/exo.jcr.component.webdav/src/test/resources/rh_nodetype.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: jcr/trunk/exo.jcr.component.webdav/src/test/resources/test.txt
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/test/resources/test.txt (rev 0)
+++ jcr/trunk/exo.jcr.component.webdav/src/test/resources/test.txt 2010-10-01 10:14:43 UTC (rev 3231)
@@ -0,0 +1,3 @@
+hello
+its a little text file for server tests
+Here is all right, I suppose :^)
\ No newline at end of file
Property changes on: jcr/trunk/exo.jcr.component.webdav/src/test/resources/test.txt
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3230 - jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-01 05:12:11 -0400 (Fri, 01 Oct 2010)
New Revision: 3230
Modified:
jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/exojcr-backup-service.xml
Log:
EXOJCR-747: fix doc
Modified: jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/exojcr-backup-service.xml
===================================================================
--- jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/exojcr-backup-service.xml 2010-10-01 09:05:08 UTC (rev 3229)
+++ jcr/trunk/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/backup/exojcr-backup-service.xml 2010-10-01 09:12:11 UTC (rev 3230)
@@ -6,6 +6,11 @@
<title>eXo JCR Backup Service</title>
+ <note>
+ <para>Restore of system workspace is not supported only as part of
+ restoring of whole repository.</para>
+ </note>
+
<section>
<title>Concept</title>
@@ -479,16 +484,10 @@
<title>Restore existing workspace or repository</title>
<important>
- <para>Restore of existing workspace or repository will be available from
- JCR 1.14.0-CR1.</para>
+ <para>Restoring of existing workspace or repository available from JCR
+ 1.14.0-CR1.</para>
</important>
- <highlights>
- <para>Restore of existed system workspace was not supported. When need
- restore of system workspace, than we need restore full
- repository.</para>
- </highlights>
-
<para>The resore of existed workspace or repositry is avaleble.</para>
<para>For restore will be used spacial methods:</para>
15 years, 9 months
- 1
- 0
exo-jcr SVN: r3229 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-10-01 05:05:08 -0400 (Fri, 01 Oct 2010)
New Revision: 3229
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
Log:
EXOJCR-961: remain node only for versionable node and OnParentVersionAction is VERSION for other cases all works accordingly to spec
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2010-10-01 07:20:11 UTC (rev 3228)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2010-10-01 09:05:08 UTC (rev 3229)
@@ -199,11 +199,7 @@
nodeTypeDataManager.getChildNodeDefinition(node.getQPath().getName(), parent.getPrimaryTypeName(),
parent.getMixinTypeNames()).getOnParentVersion();
- // ItemDataCopyIgnoredVisitory
- if (onParentVersion != OnParentVersionAction.COPY
- && onParentVersion != OnParentVersionAction.VERSION
- && onParentVersion != OnParentVersionAction.IGNORE
- || onParentVersion == OnParentVersionAction.VERSION
+ if (onParentVersion == OnParentVersionAction.VERSION
&& nodeTypeDataManager.isNodeType(Constants.MIX_VERSIONABLE, node.getPrimaryTypeName(),
node.getMixinTypeNames()))
{
15 years, 9 months
- 1
- 0