gatein SVN: r683 - in components/common/trunk: common and 2 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-19 10:22:12 -0500 (Thu, 19 Nov 2009)
New Revision: 683
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-CR1
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
+++ components/common/trunk/common/pom.xml 2009-11-19 15:22:12 UTC (rev 683)
@@ -1,9 +1,8 @@
-<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">
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -15,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
+++ components/common/trunk/logging/pom.xml 2009-11-19 15:22:12 UTC (rev 683)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
+++ components/common/trunk/mc/pom.xml 2009-11-19 15:22:12 UTC (rev 683)
@@ -1,9 +1,8 @@
-<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">
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -15,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
+++ components/common/trunk/pom.xml 2009-11-19 15:22:12 UTC (rev 683)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
+ <version>2.0.0-CR1</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.0-CR1</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.0-CR1</url>
</scm>
<!-- Import dependency management configuration -->
16 years, 5 months
gatein SVN: r682 - in components/common/trunk: common and 12 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-11-19 10:11:22 -0500 (Thu, 19 Nov 2009)
New Revision: 682
Added:
components/common/trunk/.settings/
components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java
Removed:
components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java
Modified:
components/common/trunk/
components/common/trunk/common/pom.xml
components/common/trunk/common/src/main/java/org/gatein/common/NotYetImplemented.java
components/common/trunk/common/src/main/java/org/gatein/common/http/QueryStringParser.java
components/common/trunk/common/src/main/java/org/gatein/common/i18n/LocalizedString.java
components/common/trunk/common/src/main/java/org/gatein/common/i18n/ResourceBundleManager.java
components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java
components/common/trunk/common/src/main/java/org/gatein/common/net/URLTools.java
components/common/trunk/common/src/main/java/org/gatein/common/net/file/FileURLNavigationProvider.java
components/common/trunk/common/src/main/java/org/gatein/common/net/vfs/VFSZipURLNavigationProvider.java
components/common/trunk/common/src/main/java/org/gatein/common/util/LoaderResource.java
components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java
components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java
components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java
components/common/trunk/mc/pom.xml
components/common/trunk/mc/src/main/java/org/gatein/common/mc/bootstrap/WebBootstrap.java
Log:
GTNCOMMON-7: Replace log4j by GateIn logging
Property changes on: components/common/trunk
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
@@ -1,86 +1,97 @@
-<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">
- <parent>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>common-common</artifactId>
- <packaging>jar</packaging>
- <name>GateIn - Common component (common)</name>
+<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">
+ <parent>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-parent</artifactId>
+ <version>2.0.0-CR1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>common-common</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - Common component (common)</name>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <version>2.0.0-CR1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
+ <build>
+ <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>iso-8859-1</encoding>
- </configuration>
- </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- To use in conjonctin with
- export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
- -->
- <forkMode>never</forkMode>
- <argLine>-enableassertions</argLine>
- <excludes>
- <exclude>org/gatein/common/i18n/BundleNameParserTestCase*.java</exclude>
- <exclude>org/gatein/common/net/URLNavigatorTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--
+ To use in conjonctin with export MAVEN_OPTS="-Xdebug -Xnoagent
+ -Djava.compiler=NONE
+ -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
+ -->
+ <forkMode>never</forkMode>
+ <argLine>-enableassertions</argLine>
+ <excludes>
+ <exclude>org/gatein/common/i18n/BundleNameParserTestCase*.java</exclude>
+ <exclude>org/gatein/common/net/URLNavigatorTestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
- </plugins>
+ </plugins>
- <testSourceDirectory>src/test/java</testSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- </testResources>
- </build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>false</filtering>
+ </testResource>
+ </testResources>
+ </build>
- <properties />
+ <properties />
</project>
Modified: components/common/trunk/common/src/main/java/org/gatein/common/NotYetImplemented.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/NotYetImplemented.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/NotYetImplemented.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -30,23 +30,23 @@
*/
public class NotYetImplemented extends UnsupportedOperationException
{
- /**
+ /**
*
*/
private static final long serialVersionUID = 7085502234608134040L;
-public NotYetImplemented()
- {
- super("Not yet implemented");
- }
+ public NotYetImplemented()
+ {
+ super("Not yet implemented");
+ }
- /**
- * Constructor that takes a feature name for formatting the message.
- *
- * @param featureName the feature name that is not implemented
- */
- public NotYetImplemented(String featureName)
- {
- super("Feature: " + featureName + " is not yet implemented");
- }
+ /**
+ * Constructor that takes a feature name for formatting the message.
+ *
+ * @param featureName the feature name that is not implemented
+ */
+ public NotYetImplemented(String featureName)
+ {
+ super("Feature: " + featureName + " is not yet implemented");
+ }
}
Modified: components/common/trunk/common/src/main/java/org/gatein/common/http/QueryStringParser.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/http/QueryStringParser.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/http/QueryStringParser.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,7 +22,8 @@
******************************************************************************/
package org.gatein.common.http;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.text.CharBuffer;
import org.gatein.common.text.CharEncoder;
import org.gatein.common.text.EncodingException;
@@ -47,7 +48,7 @@
}
/** . */
- private static final Logger log = Logger.getLogger(QueryStringParser.class);
+ private static final Logger log = LoggerFactory.getLogger(QueryStringParser.class);
/** . */
private static final int LOOKUP = 0;
Modified: components/common/trunk/common/src/main/java/org/gatein/common/i18n/LocalizedString.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/i18n/LocalizedString.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/i18n/LocalizedString.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -27,7 +27,8 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.ConversionException;
/**
@@ -44,7 +45,7 @@
private static final String[] EMPTY_STRINGS = new String[0];
/** The logger. */
- private static final Logger log = Logger.getLogger(LocalizedString.class);
+ private static final Logger log = LoggerFactory.getLogger(LocalizedString.class);
/** A unmodifiable map. */
private final Map<Locale, Value> values;
Modified: components/common/trunk/common/src/main/java/org/gatein/common/i18n/ResourceBundleManager.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/i18n/ResourceBundleManager.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/i18n/ResourceBundleManager.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,8 +22,6 @@
******************************************************************************/
package org.gatein.common.i18n;
-import org.apache.log4j.Logger;
-
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@@ -32,6 +30,9 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
/**
* <p>Manage a set of resource bundles. Obtention of bundles is delegated to a ResourceBundleFactory. A bundle
* obtained successfully is cached in order to avoid the potential expensive cost of the bundle retrieval.</p>
@@ -46,7 +47,7 @@
{
/** . */
- private final Logger log = Logger.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
/** . */
private final ConcurrentMap<Locale, BundleRef> localeBundles;
Modified: components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.gatein.common.io;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.Tools;
-import org.apache.log4j.Logger;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -53,7 +54,7 @@
{
/** The logger. */
- public static final Logger log = Logger.getLogger(IOTools.class);
+ public static final Logger log = LoggerFactory.getLogger(IOTools.class);
/** . */
private static final Object[] EMPTY_ARGS = new Object[0];
Modified: components/common/trunk/common/src/main/java/org/gatein/common/net/URLTools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/net/URLTools.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/net/URLTools.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.gatein.common.net;
-import org.apache.log4j.Logger;
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.common.text.FastURLEncoder;
import org.gatein.common.util.ParameterValidation;
@@ -58,7 +59,7 @@
public static final String FTP_PREFIX = "ftp://";
public static final String FILE_PREFIX = "/";
- private static final Logger log = Logger.getLogger(URLTools.class);
+ private static final Logger log = LoggerFactory.getLogger(URLTools.class);
public static boolean isURLAbsolute(String url)
{
Modified: components/common/trunk/common/src/main/java/org/gatein/common/net/file/FileURLNavigationProvider.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/net/file/FileURLNavigationProvider.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/net/file/FileURLNavigationProvider.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,10 +22,11 @@
******************************************************************************/
package org.gatein.common.net.file;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.net.URLNavigationProvider;
import org.gatein.common.net.URLVisitor;
import org.gatein.common.net.URLFilter;
-import org.apache.log4j.Logger;
import java.util.Arrays;
import java.net.URL;
@@ -41,7 +42,7 @@
{
/** The logger. */
- private Logger log = Logger.getLogger(FileURLNavigationProvider.class);
+ private Logger log = LoggerFactory.getLogger(FileURLNavigationProvider.class);
/** Trace. */
private boolean trace = log.isDebugEnabled();
Modified: components/common/trunk/common/src/main/java/org/gatein/common/net/vfs/VFSZipURLNavigationProvider.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/net/vfs/VFSZipURLNavigationProvider.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/net/vfs/VFSZipURLNavigationProvider.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -27,7 +27,8 @@
import java.net.URISyntaxException;
import java.net.URL;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.net.URLFilter;
import org.gatein.common.net.URLNavigationProvider;
import org.gatein.common.net.URLVisitor;
@@ -42,7 +43,7 @@
{
/** The logger. */
- private Logger log = Logger.getLogger(VFSZipURLNavigationProvider.class);
+ private Logger log = LoggerFactory.getLogger(VFSZipURLNavigationProvider.class);
/** Trace. */
private boolean trace = log.isDebugEnabled();
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/LoaderResource.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/LoaderResource.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/LoaderResource.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -24,8 +24,9 @@
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import org.apache.log4j.Logger;
import org.gatein.common.io.IOTools;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.xml.XMLTools;
import javax.xml.parsers.DocumentBuilder;
@@ -46,7 +47,7 @@
protected final String location;
- private final Logger log = Logger.getLogger(getClass());
+ private final Logger log = LoggerFactory.getLogger(getClass());
public LoaderResource(String location)
{
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/ParameterValidation.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,14 +22,15 @@
******************************************************************************/
package org.gatein.common.util;
-import org.apache.log4j.Logger;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 5757 $
@@ -92,7 +93,7 @@
public static class LoggingValidationErrorHandler extends ValidationErrorHandler
{
- private static final Logger log = Logger.getLogger(ParameterValidation.class);
+ private static final Logger log = LoggerFactory.getLogger(ParameterValidation.class);
private String contextMessage;
public LoggingValidationErrorHandler(String defaultValue, String contextMessage)
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,9 +22,6 @@
******************************************************************************/
package org.gatein.common.util;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
@@ -47,6 +44,9 @@
import java.util.ResourceBundle;
import java.util.Set;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
@@ -60,7 +60,7 @@
public static final int DEFAULT_BUFFER_SIZE = 512;
- public static final Logger log = Logger.getLogger(Tools.class);
+ public static final Logger log = LoggerFactory.getLogger(Tools.class);
/** 16 chars long VMID. */
public static final String VMID = VMID();
Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.gatein.common.net;
-import org.apache.log4j.Logger;
import org.gatein.common.ExtendedAssert;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import java.net.ServerSocket;
import java.net.Socket;
@@ -42,7 +43,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(AbstractSynchronizedServer.class);
+ private static final Logger log = LoggerFactory.getLogger(AbstractSynchronizedServer.class);
/** . */
private final Object lock = new Object();
Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -23,8 +23,9 @@
package org.gatein.common.net;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
import org.gatein.common.ExtendedAssert;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.net.URLTools;
import java.net.MalformedURLException;
@@ -39,7 +40,7 @@
{
/** . */
- private static final Logger log = Logger.getLogger(URLToolsTestCase.class);
+ private static final Logger log = LoggerFactory.getLogger(URLToolsTestCase.class);
private static final String MARKUP = "Hello, Anonymous!\n" +
"Counter: 0<a href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=rO0ABXNyACdvcmc" +
Deleted: components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java
===================================================================
--- components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -1,9 +0,0 @@
-/**
- * <p>The logging system for GateIn components and project.</p>
- *
- * <p>The logging system focuses on providing an API and not an implementation. The implementation of the logging
- * system uses the <a href="http://www.slf4j.org/">SLF4J</a> logging framework. Although the SLF4J frameworks
- * is already a facade for various logging framework, the goal of this facade is to decouple the GateIn project
- * from a system considered as proprietary although under an open source license.</p>
- */
-package org.gatein.common.logger;
Added: components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java
===================================================================
--- components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java (rev 0)
+++ components/common/trunk/logging/src/main/java/org/gatein/common/logging/package-info.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -0,0 +1,9 @@
+/**
+ * <p>The logging system for GateIn components and project.</p>
+ *
+ * <p>The logging system focuses on providing an API and not an implementation. The implementation of the logging
+ * system uses the <a href="http://www.slf4j.org/">SLF4J</a> logging framework. Although the SLF4J frameworks
+ * is already a facade for various logging framework, the goal of this facade is to decouple the GateIn project
+ * from a system considered as proprietary although under an open source license.</p>
+ */
+package org.gatein.common.logging;
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/mc/pom.xml 2009-11-19 15:11:22 UTC (rev 682)
@@ -1,36 +1,45 @@
-<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">
- <parent>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-parent</artifactId>
- <version>2.0.0-CR1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>common-mc</artifactId>
- <packaging>jar</packaging>
- <name>GateIn - Common component (mc)</name>
+<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">
+ <parent>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-parent</artifactId>
+ <version>2.0.0-CR1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>common-mc</artifactId>
+ <packaging>jar</packaging>
+ <name>GateIn - Common component (mc)</name>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
+ <dependencies>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-logging</artifactId>
+ <version>2.0.0-CR1-SNAPSHOT</version>
+ </dependency>
- <dependency>
- <groupId>apache-log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
</project>
Modified: components/common/trunk/mc/src/main/java/org/gatein/common/mc/bootstrap/WebBootstrap.java
===================================================================
--- components/common/trunk/mc/src/main/java/org/gatein/common/mc/bootstrap/WebBootstrap.java 2009-11-19 14:09:37 UTC (rev 681)
+++ components/common/trunk/mc/src/main/java/org/gatein/common/mc/bootstrap/WebBootstrap.java 2009-11-19 15:11:22 UTC (rev 682)
@@ -30,7 +30,8 @@
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
-import org.apache.log4j.Logger;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -86,7 +87,7 @@
public static final String BEAN_PREFIX = "jboss.portal:service=";
/** . */
- private final static Logger log = Logger.getLogger(WebBootstrap.class);
+ private final static Logger log = LoggerFactory.getLogger(WebBootstrap.class);
/** . */
private ServletContext servletContext;
16 years, 5 months
gatein SVN: r681 - tools/maven/dep/trunk.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2009-11-19 09:09:37 -0500 (Thu, 19 Nov 2009)
New Revision: 681
Modified:
tools/maven/dep/trunk/pom.xml
Log:
use SLF4J 1.5.6 instead of 1.5.8 for pom dependency
Modified: tools/maven/dep/trunk/pom.xml
===================================================================
--- tools/maven/dep/trunk/pom.xml 2009-11-19 13:44:09 UTC (rev 680)
+++ tools/maven/dep/trunk/pom.xml 2009-11-19 14:09:37 UTC (rev 681)
@@ -37,7 +37,7 @@
<version.concurrent>1.3.4</version.concurrent>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
<version.ccpp-api>1.0</version.ccpp-api>
- <version.slf4j>1.5.8</version.slf4j>
+ <version.slf4j>1.5.6</version.slf4j>
<!-- next two needs to be synchronized within modules - pc vs wcl -->
<version.apache.tomcat>6.0.16</version.apache.tomcat>
16 years, 5 months
gatein SVN: r680 - tools/maven/dep/trunk.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2009-11-19 08:44:09 -0500 (Thu, 19 Nov 2009)
New Revision: 680
Modified:
tools/maven/dep/trunk/pom.xml
Log:
- update Chromattic to 1.0.0-beta7
Modified: tools/maven/dep/trunk/pom.xml
===================================================================
--- tools/maven/dep/trunk/pom.xml 2009-11-19 13:31:52 UTC (rev 679)
+++ tools/maven/dep/trunk/pom.xml 2009-11-19 13:44:09 UTC (rev 680)
@@ -26,7 +26,7 @@
<properties>
<!-- Dependencies versions -->
<version.activation>1.1</version.activation>
- <version.chromattic>1.0.0-beta5</version.chromattic>
+ <version.chromattic>1.0.0-beta7</version.chromattic>
<version.log4j>1.2.14</version.log4j>
<version.junit>3.8.2</version.junit>
<version.javax.servlet>2.5</version.javax.servlet>
@@ -39,7 +39,7 @@
<version.ccpp-api>1.0</version.ccpp-api>
<version.slf4j>1.5.8</version.slf4j>
-<!-- next two needs to be synchronized within modules - pc vs wcl -->
+ <!-- next two needs to be synchronized within modules - pc vs wcl -->
<version.apache.tomcat>6.0.16</version.apache.tomcat>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
16 years, 5 months
gatein SVN: r679 - components/wsrp/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-11-19 08:31:52 -0500 (Thu, 19 Nov 2009)
New Revision: 679
Modified:
components/wsrp/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2009-11-19 13:31:29 UTC (rev 678)
+++ components/wsrp/trunk/pom.xml 2009-11-19 13:31:52 UTC (rev 679)
@@ -26,12 +26,11 @@
<modelVersion>4.0.0</modelVersion>
- <name>GateIn WSRP</name>
+ <name>GateIn - WSRP</name>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
<version>1.0.0-Beta02-SNAPSHOT</version>
- <url>http://www.gatein.org</url>
<packaging>pom</packaging>
16 years, 5 months
gatein SVN: r678 - components/wci/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-11-19 08:31:29 -0500 (Thu, 19 Nov 2009)
New Revision: 678
Modified:
components/wci/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-11-19 13:30:26 UTC (rev 677)
+++ components/wci/trunk/pom.xml 2009-11-19 13:31:29 UTC (rev 678)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>GateIn - Web Container Integration component</name>
+ <name>GateIn - Web Container Integration</name>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
16 years, 5 months
gatein SVN: r677 - portal/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-11-19 08:30:26 -0500 (Thu, 19 Nov 2009)
New Revision: 677
Modified:
portal/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2009-11-19 13:29:38 UTC (rev 676)
+++ portal/trunk/pom.xml 2009-11-19 13:30:26 UTC (rev 677)
@@ -34,7 +34,7 @@
<version>3.0.0-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>GateIn Portal</name>
+ <name>GateIn - Portal</name>
<properties>
<org.exoplatform.kernel.version>2.2.0-Beta02</org.exoplatform.kernel.version>
16 years, 5 months
gatein SVN: r676 - tools/maven/parent/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-11-19 08:29:38 -0500 (Thu, 19 Nov 2009)
New Revision: 676
Modified:
tools/maven/parent/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: tools/maven/parent/trunk/pom.xml
===================================================================
--- tools/maven/parent/trunk/pom.xml 2009-11-19 13:29:16 UTC (rev 675)
+++ tools/maven/parent/trunk/pom.xml 2009-11-19 13:29:38 UTC (rev 676)
@@ -8,7 +8,7 @@
<version>5-beta-4</version>
</parent>
- <name>GateIn parent</name>
+ <name>GateIn - Maven parent</name>
<description>Parent POM for GateIn components project.</description>
<url>www.jboss.org/gatein</url>
16 years, 5 months
gatein SVN: r674 - tools/maven/dep/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-11-19 08:28:29 -0500 (Thu, 19 Nov 2009)
New Revision: 674
Modified:
tools/maven/dep/trunk/pom.xml
Log:
Standardize Name and Description in POM
Modified: tools/maven/dep/trunk/pom.xml
===================================================================
--- tools/maven/dep/trunk/pom.xml 2009-11-19 13:27:58 UTC (rev 673)
+++ tools/maven/dep/trunk/pom.xml 2009-11-19 13:28:29 UTC (rev 674)
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>GateIn dependencies</name>
+ <name>GateIn - Dependencies Versions</name>
<description>GateIn dependencies configuration</description>
<url>www.jboss.org/gatein</url>
16 years, 5 months