exo-jcr SVN: r2007 - ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-04 02:49:55 -0500 (Thu, 04 Mar 2010)
New Revision: 2007
Modified:
ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
Log:
EXOJCR-567: patch from https://jira.jboss.org/jira/browse/EXOJCR-567 applied.
Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
===================================================================
--- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java 2010-03-04 06:48:44 UTC (rev 2006)
+++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java 2010-03-04 07:49:55 UTC (rev 2007)
@@ -32,6 +32,7 @@
import java.io.IOException;
import java.io.OutputStream;
+import java.net.SocketException;
import java.util.List;
import java.util.Map;
@@ -81,10 +82,16 @@
ContainerResponse response = new ContainerResponse(new ServletContainerResponseWriter(httpResponse));
requestHandler.handleRequest(request, response);
}
+ catch (SocketException se)
+ {
+ if (LOG.isDebugEnabled())
+ LOG.debug("Write socket error!", se);
+ }
catch (Exception e)
{
- LOG.error(e);
- throw new ServletException(e);
+ LOG.error("Dispatch method error!", e);
+ httpResponse.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
+ "This request can't be serve by service.\n Check request parameters and try again.");
}
finally
{
16 years, 2 months
exo-jcr SVN: r2006 - kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/rest/annotations.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-04 01:48:44 -0500 (Thu, 04 Mar 2010)
New Revision: 2006
Modified:
kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/rest/annotations/RESTEndpoint.java
Log:
EXOJCR-566
Modified: kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/rest/annotations/RESTEndpoint.java
===================================================================
--- kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/rest/annotations/RESTEndpoint.java 2010-03-04 04:31:26 UTC (rev 2005)
+++ kernel/trunk/exo.kernel.container/src/main/java/org/exoplatform/management/rest/annotations/RESTEndpoint.java 2010-03-04 06:48:44 UTC (rev 2006)
@@ -17,7 +17,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.exoplatform.management.management.annotations;
+package org.exoplatform.management.rest.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
16 years, 2 months
exo-jcr SVN: r2005 - jcr/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-03 23:31:26 -0500 (Wed, 03 Mar 2010)
New Revision: 2005
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-563: jcr enforce the dependency with slf4j-log4j12
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-03-04 04:14:55 UTC (rev 2004)
+++ jcr/trunk/pom.xml 2010-03-04 04:31:26 UTC (rev 2005)
@@ -209,7 +209,13 @@
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -308,12 +314,6 @@
<classifier>sources</classifier>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.7</version>
@@ -365,7 +365,12 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
16 years, 2 months
exo-jcr SVN: r2004 - ws/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-03 23:14:55 -0500 (Wed, 03 Mar 2010)
New Revision: 2004
Modified:
ws/trunk/pom.xml
Log:
EXOJCR-563: ws enforce the dependency with slf4j-log4j12
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2010-03-04 04:02:35 UTC (rev 2003)
+++ ws/trunk/pom.xml 2010-03-04 04:14:55 UTC (rev 2004)
@@ -162,8 +162,20 @@
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.4.O</version>
- </dependency>
-
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
16 years, 2 months
exo-jcr SVN: r2003 - core/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-03 23:02:35 -0500 (Wed, 03 Mar 2010)
New Revision: 2003
Modified:
core/trunk/pom.xml
Log:
EXOJCR-563: core enforce the dependency with slf4j-log4j12
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-03-03 19:09:11 UTC (rev 2002)
+++ core/trunk/pom.xml 2010-03-04 04:02:35 UTC (rev 2003)
@@ -344,6 +344,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
16 years, 2 months
exo-jcr SVN: r2002 - core/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-03 14:09:11 -0500 (Wed, 03 Mar 2010)
New Revision: 2002
Modified:
core/trunk/pom.xml
Log:
EXOJCR-562: core with the valid junit.framework version
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
+++ core/trunk/pom.xml 2010-03-03 19:09:11 UTC (rev 2002)
@@ -38,7 +38,7 @@
<exo.product.name>exo-core</exo.product.name>
<exo.product.specification>2.3</exo.product.specification>
- <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
+ <org.exoplatform.framework.junit.version>1.2.2-GA-SNAPSHOT</org.exoplatform.framework.junit.version>
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
<exo.test.includes>*Test*</exo.test.includes>
</properties>
16 years, 2 months
exo-jcr SVN: r2001 - in jcr/trunk: exo.jcr.component.core and 3 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-03 12:53:24 -0500 (Wed, 03 Mar 2010)
New Revision: 2001
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.webdav/pom.xml
jcr/trunk/exo.jcr.framework.command/pom.xml
jcr/trunk/pom.xml
Log:
EXOJCR-550 slf4j-log4j and log4j scope changed to <test>
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
@@ -120,6 +120,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -191,7 +192,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
</dependency>
<!-- ===== Databases JDBC support for tests ===== -->
<dependency>
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
@@ -89,6 +89,10 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
Modified: jcr/trunk/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
+++ jcr/trunk/exo.jcr.component.webdav/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
@@ -87,6 +87,10 @@
<artifactId>jtidy</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
Modified: jcr/trunk/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.framework.command/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
+++ jcr/trunk/exo.jcr.framework.command/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
@@ -1,109 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>jcr-parent</artifactId>
- <version>1.12.1-GA-SNAPSHOT</version>
- </parent>
- <artifactId>exo.jcr.framework.command</artifactId>
- <name>eXo JCR :: Framework :: Command</name>
- <description>eXo JCR command framework</description>
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.container</artifactId>
- <version>${org.exoplatform.kernel.version}</version>
- </dependency>
- <dependency>
+ <!--
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with
+ this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.component.ext</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.kernel</groupId>
- <artifactId>exo.kernel.component.command</artifactId>
- </dependency>
- <dependency>
- <groupId>org.exoplatform.core</groupId>
- <artifactId>exo.core.component.security.core</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- </dependency>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/TestJCRCommands.java</include>
- <include>**/cli/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
+ <artifactId>jcr-parent</artifactId>
+ <version>1.12.1-GA-SNAPSHOT</version>
+ </parent>
+ <artifactId>exo.jcr.framework.command</artifactId>
+ <name>eXo JCR :: Framework :: Command</name>
+ <description>eXo JCR command framework</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.component.ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.component.command</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.core</groupId>
+ <artifactId>exo.core.component.security.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/TestJCRCommands.java</include>
+ <include>**/cli/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
+++ jcr/trunk/pom.xml 2010-03-03 17:53:24 UTC (rev 2001)
@@ -208,6 +208,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -310,6 +311,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
16 years, 2 months
exo-jcr SVN: r2000 - in core/trunk: exo.core.component.database and 4 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-03 12:22:18 -0500 (Wed, 03 Mar 2010)
New Revision: 2000
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.document/pom.xml
core/trunk/exo.core.component.organization.api/pom.xml
core/trunk/exo.core.component.security.core/pom.xml
core/trunk/exo.core.component.xml-processing/pom.xml
core/trunk/pom.xml
Log:
EXOJCR-550 slf4j-log4j and log4j scope changed to <test>
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/exo.core.component.database/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -38,7 +38,13 @@
<groupId>org.exoplatform.tool</groupId>
<artifactId>exo.tool.framework.junit</artifactId>
</dependency>
+
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.component.common</artifactId>
</dependency>
Modified: core/trunk/exo.core.component.document/pom.xml
===================================================================
--- core/trunk/exo.core.component.document/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/exo.core.component.document/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -18,21 +18,20 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
<version>2.3.1-GA-SNAPSHOT</version>
</parent>
-
<artifactId>exo.core.component.document</artifactId>
-
<name>eXo Core :: Component :: Demo Service</name>
<description>eXo demo service Impl</description>
-
<dependencies>
<dependency>
<groupId>org.exoplatform.tool</groupId>
@@ -46,8 +45,11 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.container</artifactId>
</dependency>
-
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>pdfbox</groupId>
<artifactId>pdfbox</artifactId>
</dependency>
@@ -80,7 +82,6 @@
</exclusions>
</dependency>
</dependencies>
-
<build>
<testResources>
<testResource>
Modified: core/trunk/exo.core.component.organization.api/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.api/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/exo.core.component.organization.api/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -18,21 +18,20 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
<version>2.3.1-GA-SNAPSHOT</version>
</parent>
-
<artifactId>exo.core.component.organization.api</artifactId>
-
<name>eXo Core :: Component :: Organization Service API</name>
<description>eXo Organization Service API</description>
-
<dependencies>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -70,8 +69,11 @@
<groupId>picocontainer</groupId>
<artifactId>picocontainer</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
-
<build>
<testResources>
<testResource>
@@ -90,7 +92,6 @@
</includes>
</testResource>
</testResources>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -100,16 +101,33 @@
<phase>compile</phase>
<configuration>
<tasks>
- <taskdef name="hibernatedoclet" classname="xdoclet.modules.hibernate.HibernateDocletTask" classpathref="maven.dependency.classpath" />
- <hibernatedoclet destdir="${basedir}/target/classes" excludedtags="@version,@author,@todo" mergedir="target/classes" force="true" verbose="false">
- <fileset dir="${basedir}/src/main/java">
- <include name="org/exoplatform/services/organization/impl/UserImpl.java" />
- <include name="org/exoplatform/services/organization/impl/MembershipImpl.java" />
- <include name="org/exoplatform/services/organization/impl/GroupImpl.java" />
- <include name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" />
- <include name="org/exoplatform/services/organization/impl/UserProfileData.java" />
+ <taskdef
+ name="hibernatedoclet"
+ classname="xdoclet.modules.hibernate.HibernateDocletTask"
+ classpathref="maven.dependency.classpath" />
+ <hibernatedoclet
+ destdir="${basedir}/target/classes"
+ excludedtags="@version,@author,@todo"
+ mergedir="target/classes"
+ force="true"
+ verbose="false"
+ >
+ <fileset
+ dir="${basedir}/src/main/java"
+ >
+ <include
+ name="org/exoplatform/services/organization/impl/UserImpl.java" />
+ <include
+ name="org/exoplatform/services/organization/impl/MembershipImpl.java" />
+ <include
+ name="org/exoplatform/services/organization/impl/GroupImpl.java" />
+ <include
+ name="org/exoplatform/services/organization/impl/MembershipTypeImpl.java" />
+ <include
+ name="org/exoplatform/services/organization/impl/UserProfileData.java" />
</fileset>
- <hibernate version="3.0" />
+ <hibernate
+ version="3.0" />
</hibernatedoclet>
</tasks>
</configuration>
Modified: core/trunk/exo.core.component.security.core/pom.xml
===================================================================
--- core/trunk/exo.core.component.security.core/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/exo.core.component.security.core/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -51,6 +51,10 @@
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
Modified: core/trunk/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/trunk/exo.core.component.xml-processing/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/exo.core.component.xml-processing/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -18,21 +18,20 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
<version>2.3.1-GA-SNAPSHOT</version>
</parent>
-
<artifactId>exo.core.component.xml-processing</artifactId>
-
<name>eXo Core :: Component :: XML Processing Service</name>
<description>eXo XML Processing Services</description>
-
<dependencies>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -50,8 +49,11 @@
<groupId>picocontainer</groupId>
<artifactId>picocontainer</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
-
<build>
<resources>
<resource>
@@ -76,9 +78,7 @@
<include>**/*.xsd</include>
</includes>
</resource>
-
</resources>
-
<testResources>
<testResource>
<directory>src/test/resources</directory>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
+++ core/trunk/pom.xml 2010-03-03 17:22:18 UTC (rev 2000)
@@ -37,7 +37,7 @@
<properties>
<exo.product.name>exo-core</exo.product.name>
<exo.product.specification>2.3</exo.product.specification>
-
+
<org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
<org.exoplatform.kernel.version>2.2.1-GA-SNAPSHOT</org.exoplatform.kernel.version>
<exo.test.includes>*Test*</exo.test.includes>
@@ -143,6 +143,21 @@
<artifactId>jta</artifactId>
<version>1.0.1B</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>pull-parser</groupId>
16 years, 2 months
exo-jcr SVN: r1999 - in kernel/trunk: exo.kernel.component.common and 2 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-03-03 12:06:20 -0500 (Wed, 03 Mar 2010)
New Revision: 1999
Modified:
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
Log:
EXOJCR-550 slf4j-log4j and log4j scope changed to <test>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2010-03-03 17:05:38 UTC (rev 1998)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
@@ -46,5 +46,9 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2010-03-03 17:05:38 UTC (rev 1998)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
@@ -51,6 +51,10 @@
<artifactId>activation</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>jotm</groupId>
<artifactId>jotm</artifactId>
<exclusions>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-03-03 17:05:38 UTC (rev 1998)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
@@ -52,6 +52,10 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2010-03-03 17:05:38 UTC (rev 1998)
+++ kernel/trunk/exo.kernel.container/pom.xml 2010-03-03 17:06:20 UTC (rev 1999)
@@ -1,38 +1,26 @@
-<!--
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+ <!--
+ Copyright (C) 2009 eXo Platform SAS. This is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This software is
+ distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with
+ this software; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+ -->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
<version>2.2.1-GA-SNAPSHOT</version>
</parent>
-
<artifactId>exo.kernel.container</artifactId>
-
<name>eXo Kernel :: Container</name>
<description>eXo Kernel Container</description>
-
<dependencies>
<dependency>
<groupId>org.exoplatform.kernel</groupId>
@@ -41,7 +29,6 @@
<dependency>
<groupId>org.exoplatform.tool</groupId>
<artifactId>exo.tool.framework.junit</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -56,6 +43,10 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
<exclusions>
@@ -85,7 +76,6 @@
<version>1.1.3.4.O</version>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -105,17 +95,10 @@
</execution>
</executions>
</plugin>
-
<!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>apt-maven-plugin</artifactId>
- <configuration>
- <factory>org.exoplatform.management.apt.ManagementAPF</factory>
- </configuration>
- </plugin>
+ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>apt-maven-plugin</artifactId> <configuration>
+ <factory>org.exoplatform.management.apt.ManagementAPF</factory> </configuration> </plugin>
-->
-
</plugins>
</build>
</project>
\ No newline at end of file
16 years, 2 months
exo-jcr SVN: r1998 - kernel/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-03-03 12:05:38 -0500 (Wed, 03 Mar 2010)
New Revision: 1998
Modified:
kernel/trunk/pom.xml
Log:
EXOJCR-562: kernel with the valid junit.framework version
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2010-03-03 16:53:25 UTC (rev 1997)
+++ kernel/trunk/pom.xml 2010-03-03 17:05:38 UTC (rev 1998)
@@ -38,7 +38,7 @@
<properties>
<exo.product.name>exo-kernel</exo.product.name>
<exo.product.specification>2.2</exo.product.specification>
- <org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
+ <org.exoplatform.framework.junit.version>1.2.2-GA-SNAPSHOT</org.exoplatform.framework.junit.version>
<forkMode>always</forkMode>
</properties>
16 years, 2 months