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>