[gatein-commits] gatein SVN: r765 - in components/wci/trunk: .settings and 14 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Nov 23 11:31:53 EST 2009
Author: thomas.heute at jboss.com
Date: 2009-11-23 11:31:52 -0500 (Mon, 23 Nov 2009)
New Revision: 765
Added:
components/wci/trunk/.classpath
components/wci/trunk/.settings/org.maven.ide.eclipse.prefs
Modified:
components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java
components/wci/trunk/pom.xml
components/wci/trunk/test/core/
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/portlets/exo-portlet/
components/wci/trunk/test/portlets/gatein-portlet/
components/wci/trunk/test/portlets/native-portlet/
components/wci/trunk/test/servers/
components/wci/trunk/test/servers/jboss42/
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/src/common/resources/common.xml
components/wci/trunk/test/servers/tomcat6/
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java
components/wci/trunk/wci/pom.xml
components/wci/trunk/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java
components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
Log:
Update common and dep
Adding Eclipse files
Added: components/wci/trunk/.classpath
===================================================================
--- components/wci/trunk/.classpath (rev 0)
+++ components/wci/trunk/.classpath 2009-11-23 16:31:52 UTC (rev 765)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="wci/target/classes" path="wci/src/main/java"/>
+ <classpathentry kind="src" output="exo/target/classes" path="exo/src/main/java"/>
+ <classpathentry kind="src" output="tomcat/target/classes" path="tomcat/src/main/java"/>
+ <classpathentry kind="src" output="jetty/target/classes" path="jetty/src/main/java"/>
+ <classpathentry kind="src" output="test/target/test-classes" path="test/src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="test/target/test-classes" path="test/src/test/resources"/>
+ <classpathentry kind="src" output="test/core/target/classes" path="test/core/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="test/core/target/classes" path="test/core/src/main/resources"/>
+ <classpathentry excluding="**" kind="src" output="test/core/target/test-classes" path="test/core/src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="test/servers/tomcat6/target/test-classes" path="test/servers/tomcat6/src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="test/servers/jboss42/target/test-classes" path="test/servers/jboss42/src/test/resources"/>
+ <classpathentry excluding="**" kind="src" output="test/servers/jboss51/target/test-classes" path="test/servers/jboss51/src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: components/wci/trunk/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- components/wci/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ components/wci/trunk/.settings/org.maven.ide.eclipse.prefs 2009-11-23 16:31:52 UTC (rev 765)
@@ -0,0 +1,9 @@
+#Mon Nov 23 09:05:12 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=true
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java
===================================================================
--- components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/jetty/src/main/java/org/gatein/wci/jetty/Jetty6WebAppContext.java 2009-11-23 16:31:52 UTC (rev 765)
@@ -36,9 +36,6 @@
public class Jetty6WebAppContext implements WebAppContext
{
- /** The logger. */
-// protected final Logger log = Logger.getLogger(getClass());
-
/** . */
private Document descriptor;
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -22,15 +22,13 @@
</scm>
<properties>
- <version.gatein.common>2.0.0-Beta03</version.gatein.common>
+ <version.gatein.common>2.0.0-CR02</version.gatein.common>
<version.junit>3.8.2-brew</version.junit>
<version.jaxb>2.1</version.jaxb>
<version.jetty>6.1.21</version.jetty>
<version.jaxen>1.0-FCS</version.jaxen>
<version.saxpath>1.0-FCS</version.saxpath>
-
- <version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
@@ -44,7 +42,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta02</version>
+ <version>1.0.0-Beta03</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -60,8 +58,12 @@
<artifactId>common-mc</artifactId>
<version>${version.gatein.common}</version>
</dependency>
-
<dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <version>${version.gatein.common}</version>
+ </dependency>
+ <dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
<version>${project.version}</version>
@@ -98,13 +100,7 @@
<artifactId>jetty-util</artifactId>
<version>${version.jetty}</version>
</dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${version.apache.commons-logging}</version>
- </dependency>
- <dependency>
+ <dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>${version.jaxen}</version>
@@ -119,6 +115,7 @@
<artifactId>jaxb-api</artifactId>
<version>${version.jaxb}</version>
</dependency>
+
</dependencies>
</dependencyManagement>
Property changes on: components/wci/trunk/test/core
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/test/core/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -40,8 +40,16 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-mc</artifactId>
</dependency>
-
<dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
</dependency>
Property changes on: components/wci/trunk/test/portlets/exo-portlet
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/wci/trunk/test/portlets/gatein-portlet
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/wci/trunk/test/portlets/native-portlet
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/wci/trunk/test/servers
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/wci/trunk/test/servers/jboss42
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -69,6 +69,21 @@
<artifactId>common-mc</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- JBOSS UNIT DEPENDENCIES -->
<dependency>
<groupId>org.jboss.unit</groupId>
@@ -273,6 +288,9 @@
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
+ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />
<property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" />
<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
Property changes on: components/wci/trunk/test/servers/jboss51
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -69,6 +69,11 @@
<artifactId>common-mc</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- JBOSS UNIT DEPENDENCIES -->
<dependency>
<groupId>org.jboss.unit</groupId>
@@ -273,7 +278,7 @@
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" />
+ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
<property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
Modified: components/wci/trunk/test/servers/src/common/resources/common.xml
===================================================================
--- components/wci/trunk/test/servers/src/common/resources/common.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/test/servers/src/common/resources/common.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -22,7 +22,11 @@
</path>
<path id="gatein-common-shared">
- <pathelement path="${dependency.gatein-common-common.jar}"/>
+ <path path="${dependency.gatein-common-common.jar}"/>
+
+ <path path="${dependency.gatein-common-logging.jar}"/>
+ <path path="${dependency.slf4j-api.jar}"/>
+ <path path="${dependency.slf4j-simple.jar}"/>
</path>
<target name="mkdirs">
Property changes on: components/wci/trunk/test/servers/tomcat6
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -69,6 +69,21 @@
<artifactId>common-mc</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- JBOSS UNIT DEPENDENCIES -->
<dependency>
<groupId>org.jboss.unit</groupId>
@@ -273,7 +288,9 @@
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
<property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" />
+ <property name="dependency.gatein-common-logging.jar" value="${maven.dependency.org.gatein.common.common-logging.jar.path}" />
+ <property name="dependency.slf4j-api.jar" value="${maven.dependency.org.slf4j.slf4j-api.jar.path}" />
+ <property name="dependency.slf4j-simple.jar" value="${maven.dependency.org.slf4j.slf4j-simple.jar.path}" />
<property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
<property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
<property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
Modified: components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java
===================================================================
--- components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6ServletContainerContext.java 2009-11-23 16:31:52 UTC (rev 765)
@@ -31,12 +31,13 @@
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.RequestDispatchCallback;
import org.gatein.wci.command.CommandDispatcher;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wci.spi.ServletContainerContext;
import org.apache.catalina.core.StandardContext;
-import org.apache.log4j.Logger;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -54,7 +55,7 @@
*/
public class TC6ServletContainerContext implements ServletContainerContext, ContainerListener, LifecycleListener
{
- private final static Logger log = Logger.getLogger(TC6ServletContainerContext.class);
+ private final static Logger log = LoggerFactory.getLogger(TC6ServletContainerContext.class);
/** . */
private final CommandDispatcher dispatcher = new CommandDispatcher("/tomcatgateinservlet");
Modified: components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java
===================================================================
--- components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/tomcat/src/main/java/org/gatein/wci/tomcat/TC6WebAppContext.java 2009-11-23 16:31:52 UTC (rev 765)
@@ -39,9 +39,6 @@
public class TC6WebAppContext implements WebAppContext
{
- /** The logger. */
-// protected final Logger log = Logger.getLogger(getClass());
-
/** . */
private Document descriptor;
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/wci/pom.xml 2009-11-23 16:31:52 UTC (rev 765)
@@ -43,10 +43,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<!-- SCOPE TEST -->
<dependency>
@@ -90,16 +86,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-jdk</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
@@ -123,12 +109,8 @@
<artifactId>jboss-serialization</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<scope>test</scope>
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/endpoint/EndPointServlet.java 2009-11-23 16:31:52 UTC (rev 765)
@@ -28,10 +28,11 @@
import org.w3c.dom.Document;
import org.gatein.common.xml.XMLTools;
import org.gatein.common.io.IOTools;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.text.FastURLDecoder;
import org.gatein.wci.WebRequest;
import org.gatein.wci.WebResponse;
-import org.apache.log4j.Logger;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -58,7 +59,7 @@
{
/** . */
- private final static Logger log = Logger.getLogger(EndPointServlet.class);
+ private final static Logger log = LoggerFactory.getLogger(EndPointServlet.class);
/** . */
private FastURLDecoder decoder = FastURLDecoder.getUTF8Instance();
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2009-11-23 15:50:38 UTC (rev 764)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/impl/DefaultServletContainer.java 2009-11-23 16:31:52 UTC (rev 765)
@@ -32,7 +32,8 @@
import org.gatein.wci.ServletContainer;
import org.gatein.wci.WebExecutor;
import org.gatein.common.NotYetImplemented;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -52,7 +53,7 @@
*/
public class DefaultServletContainer implements ServletContainer
{
- private final static Logger log = Logger.getLogger(ServletContainer.class);
+ private final static Logger log = LoggerFactory.getLogger(ServletContainer.class);
/** . */
private final Object lock = new Object();
More information about the gatein-commits
mailing list