exo-jcr SVN: r328 - in ws/trunk: rest/core/src/test/java/org/exoplatform/services/rest and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-10-21 06:59:14 -0400 (Wed, 21 Oct 2009)
New Revision: 328
Modified:
ws/trunk/pom.xml
ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/BaseTest.java
Log:
EXOJCR-165 project dependenies updated to SHAPSHOTs
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2009-10-21 10:55:26 UTC (rev 327)
+++ ws/trunk/pom.xml 2009-10-21 10:59:14 UTC (rev 328)
@@ -45,8 +45,8 @@
<exo.product.name>exo-ws</exo.product.name>
<exo.product.specification>2.1</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.0-Beta02</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta03-SNAPSHOT/org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-Beta03-SNAPSHOT</org.exoplatform.core.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
Modified: ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/BaseTest.java
===================================================================
--- ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/BaseTest.java 2009-10-21 10:55:26 UTC (rev 327)
+++ ws/trunk/rest/core/src/test/java/org/exoplatform/services/rest/BaseTest.java 2009-10-21 10:59:14 UTC (rev 328)
@@ -43,7 +43,7 @@
public void setUp() throws Exception
{
- StandaloneContainer.setConfigurationPath("src/test/resources/conf/standalone/test-configuration.xml");
+ StandaloneContainer.setConfigurationPath("conf/standalone/test-configuration.xml");
container = StandaloneContainer.getInstance();
binder = (ResourceBinder)container.getComponentInstanceOfType(ResourceBinder.class);
requestHandler = (RequestHandlerImpl)container.getComponentInstanceOfType(RequestHandlerImpl.class);
14 years, 11 months
- 1
- 0
exo-jcr SVN: r327 - kernel/trunk/container/src/main/java/org/exoplatform/container.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-10-21 06:55:26 -0400 (Wed, 21 Oct 2009)
New Revision: 327
Modified:
kernel/trunk/container/src/main/java/org/exoplatform/container/StandaloneContainer.java
Log:
EXOJCR-198: StandaloneContainer default config initialization errors handling via printStackTrace; javadocs & cleanup
Modified: kernel/trunk/container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- kernel/trunk/container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2009-10-21 10:52:02 UTC (rev 326)
+++ kernel/trunk/container/src/main/java/org/exoplatform/container/StandaloneContainer.java 2009-10-21 10:55:26 UTC (rev 327)
@@ -63,6 +63,11 @@
private ConfigurationManagerImpl configurationManager;
+ /**
+ * Private StandaloneContainer constructor.
+ *
+ * @param configClassLoader ClassLoader
+ */
private StandaloneContainer(ClassLoader configClassLoader)
{
super(new MX4JComponentAdapterFactory(), null);
@@ -72,10 +77,10 @@
}
/**
- * Shortcut for getInstance(null, null)
+ * Shortcut for getInstance(null, null).
*
* @return the StandaloneContainer instance
- * @throws Exception
+ * @throws Exception if error occurs
*/
public static StandaloneContainer getInstance() throws Exception
{
@@ -83,10 +88,11 @@
}
/**
- * Shortcut for getInstance(configClassLoader, null)
+ * Shortcut for getInstance(configClassLoader, null).
*
+ * @param configClassLoader ClassLoader
* @return the StandaloneContainer instance
- * @throws Exception
+ * @throws Exception if error occurs
*/
public static StandaloneContainer getInstance(ClassLoader configClassLoader) throws Exception
{
@@ -94,10 +100,11 @@
}
/**
- * Shortcut for getInstance(null, components)
+ * Shortcut for getInstance(null, components).
*
+ * @param components Object[][]
* @return the StandaloneContainer instance
- * @throws Exception
+ * @throws Exception if error occurs
*/
public static StandaloneContainer getInstance(Object[][] components) throws Exception
{
@@ -107,12 +114,12 @@
/**
* A way to inject externally instantiated objects to container before it
* starts Object[][] components - an array of components in form: {{"name1",
- * component1}, {"name2", component2}, ...}
+ * component1}, {"name2", component2}, ...}.
*
- * @param configClassLoader
- * @param components
+ * @param configClassLoader ClassLoader
+ * @param components Object[][]
* @return the StandaloneContainer instance
- * @throws Exception
+ * @throws Exception if error occurs
*/
public static StandaloneContainer getInstance(ClassLoader configClassLoader, Object[][] components) throws Exception
{
@@ -151,38 +158,64 @@
}
}
+ /**
+ * Add configuration URL. Plugable way of configuration. Add the configuration to existing configurations set.
+ *
+ * @param url, URL of location to configuration file
+ * @throws MalformedURLException if path is wrong
+ */
public static void addConfigurationURL(String url) throws MalformedURLException
{
if ((url == null) || (url.length() == 0))
return;
URL confURL = new URL(url);
configurationURL = fileExists(confURL) ? confURL : null;
- // container.getContext().setAttribute(CONFIGURATION_URL_ATTR,
- // configurationURL);
}
+ /**
+ * Set configuration URL. The configuration should contains all required components configured.
+ *
+ * @param url, URL of location to configuration file
+ * @throws MalformedURLException if path is wrong
+ */
public static void setConfigurationURL(String url) throws MalformedURLException
{
useDefault = false;
addConfigurationURL(url);
}
+ /**
+ * Add configuration path. Plugable way of configuration. Add the configuration to existing configurations set.
+ *
+ * @param path, path to configuration file
+ * @throws MalformedURLException if path is wrong
+ */
public static void addConfigurationPath(String path) throws MalformedURLException
{
if ((path == null) || (path.length() == 0))
return;
URL confURL = new File(path).getAbsoluteFile().toURL();
configurationURL = fileExists(confURL) ? confURL : null;
- // container.getContext().setAttribute(CONFIGURATION_URL_ATTR,
- // configurationURL);
}
+ /**
+ * Set configuration path. The configuration should contains all required components configured.
+ *
+ * @param path, path to configuration file
+ * @throws MalformedURLException if path is wrong
+ */
public static void setConfigurationPath(String path) throws MalformedURLException
{
useDefault = false;
addConfigurationPath(path);
}
+ /**
+ * Ccreate SessionContainer.
+ *
+ * @param id String
+ * @return SessionContainer instance
+ */
public SessionContainer createSessionContainer(String id)
{
SessionContainer scontainer = getSessionManager().getSessionContainer(id);
@@ -194,32 +227,42 @@
return scontainer;
}
+ /**
+ * {@inheritDoc}
+ */
public SessionContainer createSessionContainer(String id, String owner)
{
return createSessionContainer(id);
}
+ /**
+ * {@inheritDoc}
+ */
public List<SessionContainer> getLiveSessions()
{
return getSessionManager().getLiveSessions();
}
+ /**
+ * {@inheritDoc}
+ */
public void removeSessionContainer(String sessionID)
{
getSessionManager().removeSessionContainer(sessionID);
}
/**
- * @return configurationURL
+ * Get configurationURL.
+ *
+ * @return URL
*/
public URL getConfigurationURL()
{
return configurationURL;
}
- /*
- * (non-Javadoc)
- * @see org.picocontainer.defaults.DefaultPicoContainer#stop()
+ /**
+ * {@inheritDoc}
*/
public void stop()
{
@@ -229,6 +272,9 @@
// -------------- Helpers ----------
+ /**
+ * {@inheritDoc}
+ */
public SessionManager getSessionManager()
{
if (smanager_ == null)
@@ -250,7 +296,7 @@
}
/**
- * implements strategy of choosing configuration for this container
+ * Implements strategy of choosing configuration for this container.
*
* @throws MalformedURLException
* @throws ConfigurationException
@@ -284,14 +330,11 @@
}
catch (Exception ex)
{
+ System.err.println("Error of default config init: ");
+ ex.printStackTrace();
}
}
- private static URL configurationURL()
- {
- return (URL)container.getContext().getAttribute(CONFIGURATION_URL_ATTR);
- }
-
private void populate(URL conf) throws Exception
{
configurationManager.addConfiguration(conf);
14 years, 11 months
- 1
- 0
exo-jcr SVN: r326 - core/trunk.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-10-21 06:52:02 -0400 (Wed, 21 Oct 2009)
New Revision: 326
Modified:
core/trunk/pom.xml
Log:
EXOJCR-165 project dependenies updated to SHAPSHOTs
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-10-21 10:50:07 UTC (rev 325)
+++ core/trunk/pom.xml 2009-10-21 10:52:02 UTC (rev 326)
@@ -38,7 +38,7 @@
<exo.product.name>exo-core</exo.product.name>
<exo.product.specification>2.3</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.0-Beta02</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta03-SNAPSHOT</org.exoplatform.kernel.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
14 years, 11 months
- 1
- 0
exo-jcr SVN: r325 - in kernel/trunk/commons/src/main: resources and 4 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-10-21 06:50:07 -0400 (Wed, 21 Oct 2009)
New Revision: 325
Added:
kernel/trunk/commons/src/main/resources/org/
kernel/trunk/commons/src/main/resources/org/exoplatform/
kernel/trunk/commons/src/main/resources/org/exoplatform/commons/
kernel/trunk/commons/src/main/resources/org/exoplatform/commons/utils/
kernel/trunk/commons/src/main/resources/org/exoplatform/commons/utils/mimetypes.properties
Removed:
kernel/trunk/commons/src/main/java/org/exoplatform/commons/utils/mimetypes.properties
Log:
EXOJCR-165 mimetypes.properties moved to resource folder
Deleted: kernel/trunk/commons/src/main/java/org/exoplatform/commons/utils/mimetypes.properties
===================================================================
--- kernel/trunk/commons/src/main/java/org/exoplatform/commons/utils/mimetypes.properties 2009-10-21 10:05:57 UTC (rev 324)
+++ kernel/trunk/commons/src/main/java/org/exoplatform/commons/utils/mimetypes.properties 2009-10-21 10:50:07 UTC (rev 325)
@@ -1,143 +0,0 @@
-ai=application/postscript
-aif=audio/x-aiff
-aifc=audio/x-aiff
-aiff=audio/x-aiff
-any=text/any
-asc=text/plain
-au=audio/basic
-avi=video/x-msvideo
-bcpio=application/x-bcpio
-bin=application/octet-stream
-bz2=application/x-bzip2
-cdf=application/x-netcdf
-class=application/octet-stream
-cpio=application/x-cpio
-cpt=application/mac-compactpro
-cq=application/cq-durboser
-csh=application/x-csh
-css=text/css
-dcr=application/x-director
-dir=application/x-director
-dms=application/octet-stream
-doc=application/msword
-dvi=application/x-dvi
-dxr=application/x-director
-ecma=text/qhtml
-eps=application/postscript
-esp=text/qhtml
-etx=text/x-setext
-exe=application/octet-stream
-ez=application/andrew-inset
-gif=image/gif
-gtar=application/x-gtar
-gz=application/x-gzip
-hdf=application/x-hdf
-hqx=application/mac-binhex40
-htm=text/html
-html=text/html
-ice=x-conference/x-cooltalk
-ief=image/ief
-iges=model/iges
-igs=model/iges
-jpeg=image/jpeg
-jpe=image/jpeg
-jpg=image/jpeg
-bmp=image/bmp
-js=application/x-javascript
-kar=audio/midi
-latex=application/x-latex
-lha=application/octet-stream
-lzh=application/octet-stream
-man=application/x-troff-man
-me=application/x-troff-me
-mesh=model/mesh
-mid=audio/midi
-midi=audio/midi
-mif=application/vnd=mif
-mov=video/quicktime
-m4v=video/x-m4v
-m4a=audio/x-m4a
-movie=video/x-sgi-movie
-mp2=audio/mp2
-mp3=audio/mp3
-mpe=video/mpe
-mpeg=video/mpeg
-mpg=video/mpeg
-mpg=video/mpg
-mpga=audio/mpga
-ms=application/x-troff-ms
-msh=model/mesh
-nc=application/x-netcdf
-oda=application/oda
-pbm=image/x-portable-bitmap
-pdb=chemical/x-pdb
-pdf=application/pdf
-pgm=image/x-portable-graymap
-pgn=application/x-chess-pgn
-png=image/png
-pnm=image/x-portable-anymap
-ppm=image/x-portable-pixmap
-ppt=application/ppt
-properties=text/plain
-ps=application/postscript
-qhtml=text/qhtml
-qt=video/quicktime
-ra=audio/x-realaudio
-ram=audio/x-pn-realaudio
-rm=audio/x-pn-realaudio
-ras=image/x-cmu-raster
-rgb=image/x-rgb
-roff=application/x-troff
-rpm=application/x-rpm
-rtf=text/rtf
-rtx=text/richtext
-sgm=text/sgml
-sgml=text/sgml
-sh=application/x-sh
-shar=application/x-shar
-silo=model/mesh
-sit=application/x-stuffit
-skd=application/x-koan
-skm=application/x-koan
-skp=application/x-koan
-skt=application/x-koan
-smi=application/smil
-smil=application/smil
-snd=audio/basic
-spl=application/x-futuresplash
-src=application/x-wais-source
-sv4cpio=application/x-sv4cpio
-sv4crc=application/x-sv4crc
-swf=application/x-shockwave-flash
-t=application/x-troff
-tar=application/x-tar
-tcl=application/x-tcl
-tex=application/x-tex
-texi=application/x-texinfo
-texinfo=application/x-texinfo
-tgz=application/x-gzip
-tif=image/tiff
-tiff=image/tiff
-tr=application/x-troff
-tsv=text/tab-separated-values
-txt=text/plain
-odt=application/vnd.oasis.opendocument.text
-ods=application/vnd.oasis.opendocument.spreadsheet
-odp=application/vnd.oasis.opendocument.presentation
-odb=application/vnd.oasis.opendocument.database
-ustar=application/x-ustar
-vcd=application/x-cdlink
-vm=text/plain
-vrml=model/vrml
-wav=audio/x-wav
-wrl=model/vrml
-xbm=image/x-xbitmap
-xls=application/xls
-xml=text/xml
-xpdl=text/xml
-xpm=image/x-xpixmap
-xwd=image/x-xwindowdump
-xyz=chemical/x-pdb
-zip=application/zip
-rar=application/rar
-msg=application/vnd.ms-outlook
Copied: kernel/trunk/commons/src/main/resources/org/exoplatform/commons/utils/mimetypes.properties (from rev 305, kernel/trunk/commons/src/main/java/org/exoplatform/commons/utils/mimetypes.properties)
===================================================================
--- kernel/trunk/commons/src/main/resources/org/exoplatform/commons/utils/mimetypes.properties (rev 0)
+++ kernel/trunk/commons/src/main/resources/org/exoplatform/commons/utils/mimetypes.properties 2009-10-21 10:50:07 UTC (rev 325)
@@ -0,0 +1,143 @@
+ai=application/postscript
+aif=audio/x-aiff
+aifc=audio/x-aiff
+aiff=audio/x-aiff
+any=text/any
+asc=text/plain
+au=audio/basic
+avi=video/x-msvideo
+bcpio=application/x-bcpio
+bin=application/octet-stream
+bz2=application/x-bzip2
+cdf=application/x-netcdf
+class=application/octet-stream
+cpio=application/x-cpio
+cpt=application/mac-compactpro
+cq=application/cq-durboser
+csh=application/x-csh
+css=text/css
+dcr=application/x-director
+dir=application/x-director
+dms=application/octet-stream
+doc=application/msword
+dvi=application/x-dvi
+dxr=application/x-director
+ecma=text/qhtml
+eps=application/postscript
+esp=text/qhtml
+etx=text/x-setext
+exe=application/octet-stream
+ez=application/andrew-inset
+gif=image/gif
+gtar=application/x-gtar
+gz=application/x-gzip
+hdf=application/x-hdf
+hqx=application/mac-binhex40
+htm=text/html
+html=text/html
+ice=x-conference/x-cooltalk
+ief=image/ief
+iges=model/iges
+igs=model/iges
+jpeg=image/jpeg
+jpe=image/jpeg
+jpg=image/jpeg
+bmp=image/bmp
+js=application/x-javascript
+kar=audio/midi
+latex=application/x-latex
+lha=application/octet-stream
+lzh=application/octet-stream
+man=application/x-troff-man
+me=application/x-troff-me
+mesh=model/mesh
+mid=audio/midi
+midi=audio/midi
+mif=application/vnd=mif
+mov=video/quicktime
+m4v=video/x-m4v
+m4a=audio/x-m4a
+movie=video/x-sgi-movie
+mp2=audio/mp2
+mp3=audio/mp3
+mpe=video/mpe
+mpeg=video/mpeg
+mpg=video/mpeg
+mpg=video/mpg
+mpga=audio/mpga
+ms=application/x-troff-ms
+msh=model/mesh
+nc=application/x-netcdf
+oda=application/oda
+pbm=image/x-portable-bitmap
+pdb=chemical/x-pdb
+pdf=application/pdf
+pgm=image/x-portable-graymap
+pgn=application/x-chess-pgn
+png=image/png
+pnm=image/x-portable-anymap
+ppm=image/x-portable-pixmap
+ppt=application/ppt
+properties=text/plain
+ps=application/postscript
+qhtml=text/qhtml
+qt=video/quicktime
+ra=audio/x-realaudio
+ram=audio/x-pn-realaudio
+rm=audio/x-pn-realaudio
+ras=image/x-cmu-raster
+rgb=image/x-rgb
+roff=application/x-troff
+rpm=application/x-rpm
+rtf=text/rtf
+rtx=text/richtext
+sgm=text/sgml
+sgml=text/sgml
+sh=application/x-sh
+shar=application/x-shar
+silo=model/mesh
+sit=application/x-stuffit
+skd=application/x-koan
+skm=application/x-koan
+skp=application/x-koan
+skt=application/x-koan
+smi=application/smil
+smil=application/smil
+snd=audio/basic
+spl=application/x-futuresplash
+src=application/x-wais-source
+sv4cpio=application/x-sv4cpio
+sv4crc=application/x-sv4crc
+swf=application/x-shockwave-flash
+t=application/x-troff
+tar=application/x-tar
+tcl=application/x-tcl
+tex=application/x-tex
+texi=application/x-texinfo
+texinfo=application/x-texinfo
+tgz=application/x-gzip
+tif=image/tiff
+tiff=image/tiff
+tr=application/x-troff
+tsv=text/tab-separated-values
+txt=text/plain
+odt=application/vnd.oasis.opendocument.text
+ods=application/vnd.oasis.opendocument.spreadsheet
+odp=application/vnd.oasis.opendocument.presentation
+odb=application/vnd.oasis.opendocument.database
+ustar=application/x-ustar
+vcd=application/x-cdlink
+vm=text/plain
+vrml=model/vrml
+wav=audio/x-wav
+wrl=model/vrml
+xbm=image/x-xbitmap
+xls=application/xls
+xml=text/xml
+xpdl=text/xml
+xpm=image/x-xpixmap
+xwd=image/x-xwindowdump
+xyz=chemical/x-pdb
+zip=application/zip
+rar=application/rar
+msg=application/vnd.ms-outlook
14 years, 11 months
- 1
- 0
exo-jcr SVN: r324 - in jcr/trunk/component/ext: src/test/java/org/exoplatform/services/jcr/ext and 1 other directory.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-10-21 06:05:57 -0400 (Wed, 21 Oct 2009)
New Revision: 324
Modified:
jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java
jcr/trunk/component/ext/test.cmd
Log:
EXOJCR-165: move non-java files from src to resources
Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java
===================================================================
--- jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 09:45:18 UTC (rev 323)
+++ jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 10:05:57 UTC (rev 324)
@@ -109,20 +109,20 @@
public void setUp() throws Exception
{
-// String containerConf = getClass().getResource("conf/standalone/test-configuration.xml").toString();
- StandaloneContainer.addConfigurationPath("/conf/standalone/test-configuration.xml");
- String loginConf = Thread.currentThread().getContextClassLoader().getResource("login.conf").toString();
+ String containerConf = BaseStandaloneTest.class.getResource("/conf/standalone/test-configuration.xml").toString();
-// StandaloneContainer.addConfigurationURL(containerConf);
+ StandaloneContainer.addConfigurationURL(containerConf);
+
container = StandaloneContainer.getInstance();
if (System.getProperty("java.security.auth.login.config") == null)
- System.setProperty("java.security.auth.login.config", loginConf);
+ System.setProperty("java.security.auth.login.config", Thread.currentThread().getContextClassLoader()
+ .getResource("login.conf").toString());
credentials = new CredentialsImpl("root", "exo".toCharArray());
repositoryService = (RepositoryService)container.getComponentInstanceOfType(RepositoryService.class);
- // container.start();
+
repository = (RepositoryImpl)repositoryService.getDefaultRepository();
session = (SessionImpl)repository.login(credentials, WS_NAME);
Modified: jcr/trunk/component/ext/test.cmd
===================================================================
--- jcr/trunk/component/ext/test.cmd 2009-10-21 09:45:18 UTC (rev 323)
+++ jcr/trunk/component/ext/test.cmd 2009-10-21 10:05:57 UTC (rev 324)
@@ -1,3 +1,3 @@
-@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false -Dexo.tck.skip=true -Dexo.devtest.skip=true -DforkMode=once
+@set MAVEN_OPTS=-Duser.language=en -Duser.region=us %MAVEN_OPTS% -Dmaven.test.skip=false -DforkMode=once
@start mvn clean test
\ No newline at end of file
14 years, 11 months
- 1
- 0
exo-jcr SVN: r323 - jcr/trunk/component/ext/src/test/resources.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-10-21 05:45:18 -0400 (Wed, 21 Oct 2009)
New Revision: 323
Added:
jcr/trunk/component/ext/src/test/resources/login.conf
Log:
[EXOJCR-165] login.conf added
Added: jcr/trunk/component/ext/src/test/resources/login.conf
===================================================================
--- jcr/trunk/component/ext/src/test/resources/login.conf (rev 0)
+++ jcr/trunk/component/ext/src/test/resources/login.conf 2009-10-21 09:45:18 UTC (rev 323)
@@ -0,0 +1,3 @@
+exo-domain {
+ org.exoplatform.services.security.jaas.DefaultLoginModule required;
+};
\ No newline at end of file
14 years, 11 months
- 1
- 0
exo-jcr SVN: r322 - in jcr/trunk/component/core/src: test/java/org/exoplatform/services/jcr/impl/core/query and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2009-10-21 05:32:31 -0400 (Wed, 21 Oct 2009)
New Revision: 322
Modified:
jcr/trunk/component/core/src/main/javacc/sql/JCRSQL.jjt
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java
Log:
EXOJCR-180: order jcr:score as fuction fixed
Modified: jcr/trunk/component/core/src/main/javacc/sql/JCRSQL.jjt
===================================================================
--- jcr/trunk/component/core/src/main/javacc/sql/JCRSQL.jjt 2009-10-21 09:18:35 UTC (rev 321)
+++ jcr/trunk/component/core/src/main/javacc/sql/JCRSQL.jjt 2009-10-21 09:32:31 UTC (rev 322)
@@ -603,7 +603,7 @@
{
try {
String jcrName = t.image;
- if (pseudoProperty) {
+ if (pseudoProperty && !jcrName.equals("jcr:score")) {
jcrName += "()";
}
InternalQName internalQName = locationFactory.parseJCRName(jcrName).getInternalName();
Modified: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java
===================================================================
--- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java 2009-10-21 09:18:35 UTC (rev 321)
+++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestQueryUsecases.java 2009-10-21 09:32:31 UTC (rev 322)
@@ -1007,22 +1007,21 @@
QueryManager qman = this.workspace.getQueryManager();
Query q =
- qman.createQuery("SELECT * FROM mix:title WHERE CONTAINS(*, 'brown OR fox OR jumps') ORDER BY SCORE ASC",
- Query.SQL);
+ qman.createQuery(
+ "SELECT * FROM mix:title WHERE CONTAINS(*, 'brown OR fox OR jumps') ORDER BY jcr:score() ASC", Query.SQL);
QueryResult res = q.execute();
long sqlsize = res.getNodes().getSize();
assertEquals(3, sqlsize);
- checkOrder(res, new Node[]{doc1, doc2, doc3});
+ checkOrder(res, new Node[]{doc3, doc2, doc1});
//make XPath query
Query xq =
- qman.createQuery(
- "//element(*,mix:title)[jcr:contains(., 'brown OR fox OR jumps')] order by jcr:score() ascending",
+ qman.createQuery("//element(*,mix:title)[jcr:contains(., 'brown OR fox OR jumps')] order by jcr:score()",
Query.XPATH);
QueryResult xres = xq.execute();
long xpathsize = xres.getNodes().getSize();
assertEquals(3, xpathsize);
- checkOrder(res, new Node[]{doc1, doc2, doc3});
+ checkOrder(res, new Node[]{doc3, doc2, doc1});
}
public void testOrderByLongDesc() throws Exception
14 years, 11 months
- 1
- 0
exo-jcr SVN: r321 - in jcr/trunk: component/ext/src/main and 25 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2009-10-21 05:18:35 -0400 (Wed, 21 Oct 2009)
New Revision: 321
Added:
jcr/trunk/component/ext/src/main/resources/
jcr/trunk/component/ext/src/main/resources/conf/
jcr/trunk/component/ext/src/main/resources/conf/ext-nodetypes-config.xml
jcr/trunk/component/ext/src/main/resources/conf/organization-nodetypes.xml
jcr/trunk/component/ext/src/main/resources/conf/portal/
jcr/trunk/component/ext/src/test/resources/conf/standalone/
jcr/trunk/component/ftp/src/main/resources/
jcr/trunk/component/ftp/src/main/resources/conf/
jcr/trunk/component/ftp/src/main/resources/conf/ftp-commands.xml
jcr/trunk/component/ftp/src/main/resources/conf/jcr-ftp-configuration.xml
jcr/trunk/component/ftp/src/test/resources/conf/
jcr/trunk/component/ftp/src/test/resources/conf/standalone/
jcr/trunk/component/webdav/src/main/resources/conf/
jcr/trunk/component/webdav/src/main/resources/conf/portal/
jcr/trunk/component/webdav/src/main/resources/conf/webdav-nodetypes.xml
jcr/trunk/component/webdav/src/test/resources/conf/standalone/
jcr/trunk/component/webdav/src/test/resources/login.conf
jcr/trunk/frameworks/command/src/main/resources/
jcr/trunk/frameworks/command/src/main/resources/conf/
jcr/trunk/frameworks/command/src/test/resources/conf/
jcr/trunk/frameworks/command/src/test/resources/conf/standalone/
Removed:
jcr/trunk/component/ext/src/main/java/conf/ext-nodetypes-config.xml
jcr/trunk/component/ext/src/main/java/conf/organization-nodetypes.xml
jcr/trunk/component/ext/src/main/java/conf/portal/
jcr/trunk/component/ext/src/test/java/conf/standalone/
jcr/trunk/component/ftp/src/main/java/conf/ftp-commands.xml
jcr/trunk/component/ftp/src/main/java/conf/jcr-ftp-configuration.xml
jcr/trunk/component/ftp/src/main/java/conf/portal/
jcr/trunk/component/ftp/src/test/java/conf/standalone/
jcr/trunk/component/webdav/src/main/java/conf/portal/
jcr/trunk/component/webdav/src/main/java/conf/webdav-nodetypes.xml
jcr/trunk/component/webdav/src/test/java/conf/standalone/
jcr/trunk/frameworks/command/src/main/java/conf/
jcr/trunk/frameworks/command/src/test/java/conf/standalone/
Modified:
jcr/trunk/component/ext/pom.xml
jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java
Log:
EXOJCR-165 resources moved ot resource folder
Modified: jcr/trunk/component/ext/pom.xml
===================================================================
--- jcr/trunk/component/ext/pom.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ext/pom.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -83,44 +83,16 @@
</dependency>
</dependencies>
<build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.html</include>
- <include>**/*.vm</include>
- <include>**/*.css</include>
- <include>**/*.ion</include>
- <include>**/*.groovy</include>
- </includes>
- </resource>
- </resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*.drl</include>
- <include>**/*.vm</include>
- <include>**/*.doc</include>
- <include>**/*.xls</include>
- <include>**/*.ppt</include>
- <include>**/*.txt</include>
- <include>**/*.jar</include>
- <include>**/*.pom</include>
- <include>**/*.sha1</include>
- <include>**/*.conf</include>
- <include>**/*.groovy</include>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.xls</include>
+ <include>**/*.groovy</include>
+ <include>**/login.conf</include>
</includes>
</testResource>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </testResource>
</testResources>
<pluginManagement>
<plugins>
Deleted: jcr/trunk/component/ext/src/main/java/conf/ext-nodetypes-config.xml
===================================================================
--- jcr/trunk/component/ext/src/main/java/conf/ext-nodetypes-config.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ext/src/main/java/conf/ext-nodetypes-config.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -1,230 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- metadata nodetypes -->
- <nodeType name="exo:metadata" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
- <propertyDefinitions>
- <propertyDefinition name="exo:internalUse" requiredType="Boolean" autoCreated="true" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- <defaultValues>
- <defaultValue>false</defaultValue>
- </defaultValues>
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- Dublin Core Metadata Elemet Set, Version 1.1 -->
- <nodeType name="dc:elementSet" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>exo:metadata</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="dc:title" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:creator" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:subject" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:publisher" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:contributor" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:date" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:resourceType" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:format" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:identifier" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:source" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:language" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:relation" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:coverage" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="dc:rights" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="true">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- audit nodetypes -->
-
- <nodeType name="exo:auditable" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:auditHistory" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:auditRecord" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:user" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:created" requiredType="Date" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:propertyName" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:eventType" requiredType="Long" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:auditVersion" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:auditVersionName" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:auditHistory" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:targetNode" requiredType="Reference" autoCreated="true" mandatory="true" onParentVersion="IGNORE"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastRecord" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="IGNORE"
- protected="true" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:auditRecord" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
- protected="true" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:auditRecord</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:auditStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:auditHistory" autoCreated="false" mandatory="false" onParentVersion="VERSION"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:auditHistory</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="nt:resource" isMixin="false" hasOrderableChildNodes="false" primaryItemName="jcr:data">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="jcr:filename" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="jcr:encoding" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="jcr:mimeType" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="jcr:data" requiredType="Binary" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="jcr:lastModified" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="IGNORE"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:groovyResourceContainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:resource</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:autoload" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
-</nodeTypes>
\ No newline at end of file
Deleted: jcr/trunk/component/ext/src/main/java/conf/organization-nodetypes.xml
===================================================================
--- jcr/trunk/component/ext/src/main/java/conf/organization-nodetypes.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ext/src/main/java/conf/organization-nodetypes.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -1,237 +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.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- JCR Organization service -->
-
- <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- profile attributes -->
- <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
- <supertypes>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="true">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" 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>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>exo:group</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-
- <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:user</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-</nodeTypes>
Copied: jcr/trunk/component/ext/src/main/resources/conf/ext-nodetypes-config.xml (from rev 319, jcr/trunk/component/ext/src/main/java/conf/ext-nodetypes-config.xml)
===================================================================
--- jcr/trunk/component/ext/src/main/resources/conf/ext-nodetypes-config.xml (rev 0)
+++ jcr/trunk/component/ext/src/main/resources/conf/ext-nodetypes-config.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,230 @@
+<!--
+
+ 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.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- metadata nodetypes -->
+ <nodeType name="exo:metadata" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <propertyDefinitions>
+ <propertyDefinition name="exo:internalUse" requiredType="Boolean" autoCreated="true" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ <defaultValues>
+ <defaultValue>false</defaultValue>
+ </defaultValues>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- Dublin Core Metadata Elemet Set, Version 1.1 -->
+ <nodeType name="dc:elementSet" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>exo:metadata</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="dc:title" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:creator" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:subject" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:publisher" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:contributor" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:date" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:resourceType" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:format" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:identifier" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:source" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:language" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:relation" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:coverage" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="dc:rights" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="true">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- audit nodetypes -->
+
+ <nodeType name="exo:auditable" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:auditHistory" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:auditRecord" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:user" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:created" requiredType="Date" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:propertyName" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:eventType" requiredType="Long" autoCreated="true" mandatory="true" onParentVersion="IGNORE" protected="true"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:auditVersion" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:auditVersionName" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:auditHistory" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:targetNode" requiredType="Reference" autoCreated="true" mandatory="true" onParentVersion="IGNORE"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastRecord" requiredType="String" autoCreated="true" mandatory="true" onParentVersion="IGNORE"
+ protected="true" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:auditRecord" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
+ protected="true" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:auditRecord</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:auditStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:auditHistory" autoCreated="false" mandatory="false" onParentVersion="VERSION"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:auditHistory</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="nt:resource" isMixin="false" hasOrderableChildNodes="false" primaryItemName="jcr:data">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="jcr:filename" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="jcr:encoding" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="jcr:mimeType" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="jcr:data" requiredType="Binary" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="jcr:lastModified" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="IGNORE"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:groovyResourceContainer" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:resource</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:autoload" requiredType="Boolean" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+</nodeTypes>
\ No newline at end of file
Copied: jcr/trunk/component/ext/src/main/resources/conf/organization-nodetypes.xml (from rev 319, jcr/trunk/component/ext/src/main/java/conf/organization-nodetypes.xml)
===================================================================
--- jcr/trunk/component/ext/src/main/resources/conf/organization-nodetypes.xml (rev 0)
+++ jcr/trunk/component/ext/src/main/resources/conf/organization-nodetypes.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,237 @@
+<?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.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- JCR Organization service -->
+
+ <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- profile attributes -->
+ <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
+ <supertypes>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" 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>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>exo:group</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+
+ <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:user</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+</nodeTypes>
Copied: jcr/trunk/component/ext/src/main/resources/conf/portal (from rev 319, jcr/trunk/component/ext/src/main/java/conf/portal)
Modified: jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java
===================================================================
--- jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ext/src/test/java/org/exoplatform/services/jcr/ext/BaseStandaloneTest.java 2009-10-21 09:18:35 UTC (rev 321)
@@ -109,10 +109,11 @@
public void setUp() throws Exception
{
- String containerConf = getClass().getResource("/conf/standalone/test-configuration.xml").toString();
+// String containerConf = getClass().getResource("conf/standalone/test-configuration.xml").toString();
+ StandaloneContainer.addConfigurationPath("/conf/standalone/test-configuration.xml");
String loginConf = Thread.currentThread().getContextClassLoader().getResource("login.conf").toString();
- StandaloneContainer.addConfigurationURL(containerConf);
+// StandaloneContainer.addConfigurationURL(containerConf);
container = StandaloneContainer.getInstance();
if (System.getProperty("java.security.auth.login.config") == null)
Copied: jcr/trunk/component/ext/src/test/resources/conf/standalone (from rev 319, jcr/trunk/component/ext/src/test/java/conf/standalone)
Deleted: jcr/trunk/component/ftp/src/main/java/conf/ftp-commands.xml
===================================================================
--- jcr/trunk/component/ftp/src/main/java/conf/ftp-commands.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ftp/src/main/java/conf/ftp-commands.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -1,48 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<catalog name="FTP">
- <command name="CDUP" className="org.exoplatform.services.ftp.command.CmdCdUp" />
- <command name="CWD" className="org.exoplatform.services.ftp.command.CmdCwd" />
- <command name="DELE" className="org.exoplatform.services.ftp.command.CmdDele" />
- <command name="HELP" className="org.exoplatform.services.ftp.command.CmdHelp" />
- <command name="LIST" className="org.exoplatform.services.ftp.command.CmdList" />
- <command name="MKD" className="org.exoplatform.services.ftp.command.CmdMkd" />
- <command name="NLST" className="org.exoplatform.services.ftp.command.CmdNLst" />
- <command name="NOOP" className="org.exoplatform.services.ftp.command.CmdNoop" />
- <command name="PASS" className="org.exoplatform.services.ftp.command.CmdPass" />
- <command name="PASV" className="org.exoplatform.services.ftp.command.CmdPasv" />
- <command name="PORT" className="org.exoplatform.services.ftp.command.CmdPort" />
- <command name="PWD" className="org.exoplatform.services.ftp.command.CmdPwd" />
- <command name="QUIT" className="org.exoplatform.services.ftp.command.CmdQuit" />
- <command name="REST" className="org.exoplatform.services.ftp.command.CmdRest" />
- <command name="RETR" className="org.exoplatform.services.ftp.command.CmdRetr" />
- <command name="RMD" className="org.exoplatform.services.ftp.command.CmdRmd" />
- <command name="RNFR" className="org.exoplatform.services.ftp.command.CmdRnFr" />
- <command name="RNTO" className="org.exoplatform.services.ftp.command.CmdRnTo" />
- <command name="SIZE" className="org.exoplatform.services.ftp.command.CmdSize" />
- <command name="STOR" className="org.exoplatform.services.ftp.command.CmdStor" />
- <command name="SYST" className="org.exoplatform.services.ftp.command.CmdSyst" />
- <command name="TYPE" className="org.exoplatform.services.ftp.command.CmdType" />
- <command name="USER" className="org.exoplatform.services.ftp.command.CmdUser" />
- <command name="MODE" className="org.exoplatform.services.ftp.command.CmdMode" />
- <command name="STAT" className="org.exoplatform.services.ftp.command.CmdStat" />
- <command name="STRU" className="org.exoplatform.services.ftp.command.CmdStru" />
-</catalog>
Deleted: jcr/trunk/component/ftp/src/main/java/conf/jcr-ftp-configuration.xml
===================================================================
--- jcr/trunk/component/ftp/src/main/java/conf/jcr-ftp-configuration.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/ftp/src/main/java/conf/jcr-ftp-configuration.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-<configuration>
- <component>
- <key>org.exoplatform.services.ftp.FtpServiceImpl</key>
- <type>org.exoplatform.services.ftp.FtpServiceImpl</type>
- <init-params>
- <value-param>
- <name>command-port</name>
- <value>2121</value>
- </value-param>
- <value-param>
- <name>data-min-port</name>
- <value>52000</value>
- </value-param>
- <value-param>
- <name>data-max-port</name>
- <value>53000</value>
- </value-param>
- <value-param>
- <name>system</name>
- <!-- <value>Windows_NT</value>-->
- <value>UNIX Type: L8</value>
- </value-param>
- <value-param>
- <name>client-side-encoding</name>
- <value>windows-1251</value>
- <!-- <value>KOI8-R</value>-->
- </value-param>
- <value-param>
- <name>def-folder-node-type</name>
- <value>nt:folder</value>
- </value-param>
- <value-param>
- <name>def-file-node-type</name>
- <value>nt:file</value>
- </value-param>
- <value-param>
- <name>def-file-mime-type</name>
- <value>application/octet-stream</value>
- </value-param>
- <value-param>
- <name>cache-folder-name</name>
- <value>../temp/ftp_cache</value>
- </value-param>
- <!-- <bytes per second>-->
- <!-- <value-param>-->
- <!-- <name>upload-speed-limit</name>-->
- <!-- <value>20480</value>-->
- <!-- </value-param>-->
-
- <!-- <bytes per second>-->
- <!-- <value-param>-->
- <!-- <name>download-speed-limit</name>-->
- <!-- <value>20480</value>-->
- <!-- </value-param>-->
-
- <!-- <seconds>-->
- <!-- <value-param>-->
- <!-- <name>timeout</name>-->
- <!-- <value>60</value>-->
- <!-- </value-param>-->
- </init-params>
- </component>
-</configuration>
\ No newline at end of file
Copied: jcr/trunk/component/ftp/src/main/resources/conf/ftp-commands.xml (from rev 319, jcr/trunk/component/ftp/src/main/java/conf/ftp-commands.xml)
===================================================================
--- jcr/trunk/component/ftp/src/main/resources/conf/ftp-commands.xml (rev 0)
+++ jcr/trunk/component/ftp/src/main/resources/conf/ftp-commands.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,48 @@
+<!--
+
+ 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.
+
+-->
+<catalog name="FTP">
+ <command name="CDUP" className="org.exoplatform.services.ftp.command.CmdCdUp" />
+ <command name="CWD" className="org.exoplatform.services.ftp.command.CmdCwd" />
+ <command name="DELE" className="org.exoplatform.services.ftp.command.CmdDele" />
+ <command name="HELP" className="org.exoplatform.services.ftp.command.CmdHelp" />
+ <command name="LIST" className="org.exoplatform.services.ftp.command.CmdList" />
+ <command name="MKD" className="org.exoplatform.services.ftp.command.CmdMkd" />
+ <command name="NLST" className="org.exoplatform.services.ftp.command.CmdNLst" />
+ <command name="NOOP" className="org.exoplatform.services.ftp.command.CmdNoop" />
+ <command name="PASS" className="org.exoplatform.services.ftp.command.CmdPass" />
+ <command name="PASV" className="org.exoplatform.services.ftp.command.CmdPasv" />
+ <command name="PORT" className="org.exoplatform.services.ftp.command.CmdPort" />
+ <command name="PWD" className="org.exoplatform.services.ftp.command.CmdPwd" />
+ <command name="QUIT" className="org.exoplatform.services.ftp.command.CmdQuit" />
+ <command name="REST" className="org.exoplatform.services.ftp.command.CmdRest" />
+ <command name="RETR" className="org.exoplatform.services.ftp.command.CmdRetr" />
+ <command name="RMD" className="org.exoplatform.services.ftp.command.CmdRmd" />
+ <command name="RNFR" className="org.exoplatform.services.ftp.command.CmdRnFr" />
+ <command name="RNTO" className="org.exoplatform.services.ftp.command.CmdRnTo" />
+ <command name="SIZE" className="org.exoplatform.services.ftp.command.CmdSize" />
+ <command name="STOR" className="org.exoplatform.services.ftp.command.CmdStor" />
+ <command name="SYST" className="org.exoplatform.services.ftp.command.CmdSyst" />
+ <command name="TYPE" className="org.exoplatform.services.ftp.command.CmdType" />
+ <command name="USER" className="org.exoplatform.services.ftp.command.CmdUser" />
+ <command name="MODE" className="org.exoplatform.services.ftp.command.CmdMode" />
+ <command name="STAT" className="org.exoplatform.services.ftp.command.CmdStat" />
+ <command name="STRU" className="org.exoplatform.services.ftp.command.CmdStru" />
+</catalog>
Copied: jcr/trunk/component/ftp/src/main/resources/conf/jcr-ftp-configuration.xml (from rev 319, jcr/trunk/component/ftp/src/main/java/conf/jcr-ftp-configuration.xml)
===================================================================
--- jcr/trunk/component/ftp/src/main/resources/conf/jcr-ftp-configuration.xml (rev 0)
+++ jcr/trunk/component/ftp/src/main/resources/conf/jcr-ftp-configuration.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+<configuration>
+ <component>
+ <key>org.exoplatform.services.ftp.FtpServiceImpl</key>
+ <type>org.exoplatform.services.ftp.FtpServiceImpl</type>
+ <init-params>
+ <value-param>
+ <name>command-port</name>
+ <value>2121</value>
+ </value-param>
+ <value-param>
+ <name>data-min-port</name>
+ <value>52000</value>
+ </value-param>
+ <value-param>
+ <name>data-max-port</name>
+ <value>53000</value>
+ </value-param>
+ <value-param>
+ <name>system</name>
+ <!-- <value>Windows_NT</value>-->
+ <value>UNIX Type: L8</value>
+ </value-param>
+ <value-param>
+ <name>client-side-encoding</name>
+ <value>windows-1251</value>
+ <!-- <value>KOI8-R</value>-->
+ </value-param>
+ <value-param>
+ <name>def-folder-node-type</name>
+ <value>nt:folder</value>
+ </value-param>
+ <value-param>
+ <name>def-file-node-type</name>
+ <value>nt:file</value>
+ </value-param>
+ <value-param>
+ <name>def-file-mime-type</name>
+ <value>application/octet-stream</value>
+ </value-param>
+ <value-param>
+ <name>cache-folder-name</name>
+ <value>../temp/ftp_cache</value>
+ </value-param>
+ <!-- <bytes per second>-->
+ <!-- <value-param>-->
+ <!-- <name>upload-speed-limit</name>-->
+ <!-- <value>20480</value>-->
+ <!-- </value-param>-->
+
+ <!-- <bytes per second>-->
+ <!-- <value-param>-->
+ <!-- <name>download-speed-limit</name>-->
+ <!-- <value>20480</value>-->
+ <!-- </value-param>-->
+
+ <!-- <seconds>-->
+ <!-- <value-param>-->
+ <!-- <name>timeout</name>-->
+ <!-- <value>60</value>-->
+ <!-- </value-param>-->
+ </init-params>
+ </component>
+</configuration>
\ No newline at end of file
Copied: jcr/trunk/component/ftp/src/test/resources/conf/standalone (from rev 319, jcr/trunk/component/ftp/src/test/java/conf/standalone)
Deleted: jcr/trunk/component/webdav/src/main/java/conf/webdav-nodetypes.xml
===================================================================
--- jcr/trunk/component/webdav/src/main/java/conf/webdav-nodetypes.xml 2009-10-21 08:41:00 UTC (rev 320)
+++ jcr/trunk/component/webdav/src/main/java/conf/webdav-nodetypes.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -1,133 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
-
- <nodeType name="webdav:folder" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
-
- <supertypes>
- <supertype>nt:folder</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
-
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
- <nodeType name="webdav:file" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
-
- <supertypes>
- <supertype>nt:file</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
-
- <propertyDefinitions>
- <propertyDefinition name="webdav:Author" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
- <nodeType name="webdav:badres" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
-
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
-
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
- <nodeType name="webdav:goodres" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
-
- <supertypes>
- <supertype>nt:resource</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
-
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
- <nodeType name="mix:wdTestMixin1" isMixin="true" hasOrderableChildNodes="true" primaryItemName="">
-
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
- <nodeType name="mix:wdTestMixin2" isMixin="true" hasOrderableChildNodes="true" primaryItemName="">
-
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
-
- </nodeType>
-
-
- <nodeType name="exo:testResource" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
-
- <supertypes>
- <supertype>nt:resource</supertype>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <!-- propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>nt:unstructured</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions -->
- </nodeType>
-
-</nodeTypes>
-
Copied: jcr/trunk/component/webdav/src/main/resources/conf/portal (from rev 319, jcr/trunk/component/webdav/src/main/java/conf/portal)
Copied: jcr/trunk/component/webdav/src/main/resources/conf/webdav-nodetypes.xml (from rev 319, jcr/trunk/component/webdav/src/main/java/conf/webdav-nodetypes.xml)
===================================================================
--- jcr/trunk/component/webdav/src/main/resources/conf/webdav-nodetypes.xml (rev 0)
+++ jcr/trunk/component/webdav/src/main/resources/conf/webdav-nodetypes.xml 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,133 @@
+<!--
+
+ 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.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
+
+ <nodeType name="webdav:folder" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+
+ <supertypes>
+ <supertype>nt:folder</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+ <nodeType name="webdav:file" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+
+ <supertypes>
+ <supertype>nt:file</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+
+ <propertyDefinitions>
+ <propertyDefinition name="webdav:Author" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+ <nodeType name="webdav:badres" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+ <nodeType name="webdav:goodres" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+
+ <supertypes>
+ <supertype>nt:resource</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+ <nodeType name="mix:wdTestMixin1" isMixin="true" hasOrderableChildNodes="true" primaryItemName="">
+
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+ <nodeType name="mix:wdTestMixin2" isMixin="true" hasOrderableChildNodes="true" primaryItemName="">
+
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+
+ </nodeType>
+
+
+ <nodeType name="exo:testResource" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+
+ <supertypes>
+ <supertype>nt:resource</supertype>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <!-- propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="IGNORE" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="nt:unstructured" autoCreated="false" mandatory="false" onParentVersion="IGNORE"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>nt:unstructured</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions -->
+ </nodeType>
+
+</nodeTypes>
+
Copied: jcr/trunk/component/webdav/src/test/resources/conf/standalone (from rev 319, jcr/trunk/component/webdav/src/test/java/conf/standalone)
Added: jcr/trunk/component/webdav/src/test/resources/login.conf
===================================================================
--- jcr/trunk/component/webdav/src/test/resources/login.conf (rev 0)
+++ jcr/trunk/component/webdav/src/test/resources/login.conf 2009-10-21 09:18:35 UTC (rev 321)
@@ -0,0 +1,3 @@
+exo-domain {
+ org.exoplatform.services.security.jaas.DefaultLoginModule required;
+};
\ No newline at end of file
Copied: jcr/trunk/frameworks/command/src/main/resources/conf (from rev 319, jcr/trunk/frameworks/command/src/main/java/conf)
Copied: jcr/trunk/frameworks/command/src/test/resources/conf/standalone (from rev 319, jcr/trunk/frameworks/command/src/test/java/conf/standalone)
14 years, 11 months
- 1
- 0
exo-jcr SVN: r320 - jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core.
by do-not-reply＠jboss.org
Author: aparfonov
Date: 2009-10-21 04:41:00 -0400 (Wed, 21 Oct 2009)
New Revision: 320
Modified:
jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java
Log:
EXOJCR-197 : Add JUnit that shows error.
Modified: jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java
===================================================================
--- jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java 2009-10-20 11:39:35 UTC (rev 319)
+++ jcr/trunk/component/core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSessionDataManager.java 2009-10-21 08:41:00 UTC (rev 320)
@@ -34,6 +34,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -334,4 +336,25 @@
assertNotNull(modificationManager.getItemData(QPath.makeChildPath(((NodeImpl)root).getData().getQPath(),
new InternalQName("", "testgetitemNode"))));
}
+
+ public void testRemove() throws Exception
+ {
+ Node n = session.getRootNode().addNode("node", "nt:unstructured");
+ n.addMixin("mix:referenceable");
+ session.save();
+ String uuid = n.getUUID();
+ Node p = n.getParent();
+ n.remove();
+ p.save();
+ try
+ {
+ modificationManager.getItemByIdentifier(uuid, true);
+// session.getNodeByUUID(uuid);
+ fail("Node must be removed.");
+ }
+ catch(ItemNotFoundException e)
+ {
+
+ }
+ }
}
14 years, 11 months
- 1
- 0
exo-jcr SVN: r319 - jcr/trunk/component/core/src/main/resources.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2009-10-20 07:39:35 -0400 (Tue, 20 Oct 2009)
New Revision: 319
Removed:
jcr/trunk/component/core/src/main/resources/META-INF/
Log:
EXOJCR-196: META-INF removed
14 years, 11 months
- 1
- 0