Revision: 91
http://mvn-infix.svn.sourceforge.net/mvn-infix/?rev=91&view=rev
Author: bindul
Date: 2010-12-14 22:31:05 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
Updated base redirect URL generation and tests
Modified Paths:
--------------
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/actions/RepoMapGenAction.java
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SfNetFRSParserMapGenerator.java
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SftpDirectoryScanner.java
plugins/sfnet-mvnrepo-plugin/trunk/src/main/mdo/mvn-repo-config.mdo
plugins/sfnet-mvnrepo-plugin/trunk/src/test/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SFTPParseTest.java
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T3Expected.xml
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T4Expected.xml
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T5Expected.xml
shared/infix-plugins-common/trunk/infix-test-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/test/PlexusTestCase.java
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/actions/RepoMapGenAction.java
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/actions/RepoMapGenAction.java
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/actions/RepoMapGenAction.java
2010-12-14 22:31:05 UTC (rev 91)
@@ -88,22 +88,68 @@
List<SourceForgeFRSMapper> sourceForgeMappers =
repositoryConfig.getSourceForgeFRSMappers();
if (null != sourceForgeMappers &&
!sourceForgeMappers.isEmpty()) {
for (SourceForgeFRSMapper sfFrsMapper :
sourceForgeMappers) {
+ normalizeSfFrsMapper (sfFrsMapper);
MapGenerator<SourceForgeFRSMapper> mapGenerator
= mapGeneratorFactory.getMapGenerator(sfFrsMapper);
parsedMaps.add(mapGenerator.generateRepositoryMap(sfFrsMapper, mojoInfo));
}
}
// Merge the maps!!
- mergeMaps(parsedMaps, mojoInfo);
+ mergeMaps(parsedMaps, repositoryConfig);
}
/**
- * @param parsedMaps
- * @param mojoInfo
+ * Normalizes the object and sets the default values
+ * @throws MapGenerationException If required fields are not present
*/
- private void mergeMaps (List<RepositoryMap> parsedMaps,
SfNetMvnMojoInfo mojoInfo) {
+ private void normalizeSfFrsMapper (SourceForgeFRSMapper sfFrsMapper)
throws MapGenerationException {
+ if (!isNullOrEmpty(sfFrsMapper.getProjectId())) {
+ String projectId = sfFrsMapper.getProjectId().trim();
+ // The base directory
+ if (isNullOrEmpty(sfFrsMapper.getBaseDir())) {
+ // Default: /home/frs/project/f/fo/fooproject/
+ StringBuilder baseDir = new StringBuilder();
+ baseDir.append("/home/frs/project/");
+ baseDir.append(projectId.substring(0, 1));
+ baseDir.append('/');
+ baseDir.append(projectId.substring(0, 2));
+ baseDir.append('/');
+ baseDir.append(projectId);
+ baseDir.append('/');
+ sfFrsMapper.setBaseDir(baseDir.toString());
+ }
+
+ // Download URL
+ if (isNullOrEmpty(sfFrsMapper.getBaseUrl())) {
+ // Default
http://sourceforge.net/projects/fooproject/files/
+ sfFrsMapper.setBaseUrl(new
StringBuilder("http://sourceforge.net/projects/";)
+
.append(projectId).append("/files/").toString());
+ }
+ } else {
+ throw new MapGenerationException("projectId is
required");
+ }
+ }
+
+ /**
+ *
+ */
+ private void mergeMaps (List<RepositoryMap> parsedMaps,
RepositoryConfig repositoryConfig) {
+
+ // Create the master
+ RepositoryMap mergedRepoMap = new RepositoryMap();
+ mergedRepoMap.setRedirectBase(repositoryConfig.getBaseUrl());
+ mergedRepoMap.setId(repositoryConfig.getId());
+ mergedRepoMap.setName(repositoryConfig.getName());
+
+// for (RepositoryMap parsedMap : parsedMaps) {
+// handleDirectory (parsedMap, )
+// }
+
// TODO Auto-generated method stub
-
}
+ private boolean isNullOrEmpty (String test) {
+ return ((null == test) || (test.trim().length() == 0));
+ }
+
}
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SfNetFRSParserMapGenerator.java
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SfNetFRSParserMapGenerator.java
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SfNetFRSParserMapGenerator.java
2010-12-14 22:31:05 UTC (rev 91)
@@ -70,8 +70,6 @@
// Process group id, if present
Directory mapWorkingDir = processBaseGroupId (repoMap,
configuration.getBaseGroupId());
- // Initialize the directory scanner
-
// Handle directories
try {
DirectoryScanner dirScanner =
container.lookup(DirectoryScanner.class, "sftp");
@@ -105,6 +103,10 @@
}
}
+ if (workingDir != repoMap) {
+ workingDir.setRedirectBase(repoMap.getRedirectBase());
+ }
+
return workingDir;
}
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SftpDirectoryScanner.java
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SftpDirectoryScanner.java
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/main/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SftpDirectoryScanner.java
2010-12-14 22:31:05 UTC (rev 91)
@@ -40,11 +40,11 @@
import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.ChannelSftp.LsEntry;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
import com.mindtree.techworks.infix.plugins.sfnetmvnrepo.SfNetMvnMojoInfo;
import
com.mindtree.techworks.infix.plugins.sfnetmvnrepo.mapper.MapGenerationException;
import
com.mindtree.techworks.infix.plugins.sfnetmvnrepo.mapper.jschutil.JSchLogFacade;
@@ -137,7 +137,7 @@
}
}
- private void handleDirectory (Directory mapWorkingDir, String
parentDir, String parentFilterPath) throws SftpException {
+ private void handleDirectory (Directory mapWorkingDir, String
parentDir, String parentFilterPath) throws SftpException,
MapGenerationException {
log.debug("Checking directory: " + parentDir + " with parent
filter path " + parentFilterPath);
@SuppressWarnings ("unchecked")
@@ -184,10 +184,12 @@
* @param mapWorkingDir
* @param lsEntry
* @return
+ * @throws MapGenerationException
*/
- private Directory createOrGetNewDir (String completeFilterPath,
Directory mapWorkingDir, LsEntry lsEntry) {
+ private Directory createOrGetNewDir (String completeFilterPath,
Directory mapWorkingDir, LsEntry lsEntry) throws MapGenerationException {
- StringBuilder requiredDirTree = new
StringBuilder(checkParentBuffer(completeFilterPath).replace('.', '/'));
+ String parentBuffer = checkParentBuffer(completeFilterPath);
+ StringBuilder requiredDirTree = new
StringBuilder(parentBuffer.replace('.', '/'));
if (requiredDirTree.length() > 0) {
requiredDirTree.append('/'); }
requiredDirTree.append(lsEntry.getFilename());
@@ -198,6 +200,24 @@
reqDir = getOrCreateDir (groupPart, reqDir);
}
+ // Fix the URL here
+ if (parentBuffer.length() > 0) {
+ StringBuilder baseUrl = new StringBuilder();
+ baseUrl.append(configuration.getBaseUrl());
+ if (!configuration.getBaseUrl().endsWith("/") &&
!completeFilterPath.startsWith("/")) {
+ baseUrl.append('/');
+ }
+ if (configuration.getBaseUrl().endsWith("/") &&
completeFilterPath.startsWith("/")) {
+ baseUrl.deleteCharAt(baseUrl.lastIndexOf("/"));
+ }
+ baseUrl.append(completeFilterPath);
+ if (!completeFilterPath.endsWith("/")) {
+ baseUrl.append('/');
+ }
+
+ reqDir.setRedirectBase(baseUrl.toString());
+ }
+
return reqDir;
}
Modified: plugins/sfnet-mvnrepo-plugin/trunk/src/main/mdo/mvn-repo-config.mdo
===================================================================
--- plugins/sfnet-mvnrepo-plugin/trunk/src/main/mdo/mvn-repo-config.mdo
2010-12-12 01:05:33 UTC (rev 90)
+++ plugins/sfnet-mvnrepo-plugin/trunk/src/main/mdo/mvn-repo-config.mdo
2010-12-14 22:31:05 UTC (rev 91)
@@ -174,7 +174,7 @@
<name>SourceForgeFRSMapper</name>
<version>0.1.0+</version>
<superClass>AuthenticatedRepositoryMapper</superClass>
- <description>Scans the Source Forge FRS to generate the
map</description>
+ <description>Scans the Source Forge FRS to generate the
map. The base URL based on which the rest of the download URLs are set. If not
provided defaults to
http://sourceforge.net/projects/fooproject/files/</description>
<fields>
<field xml.attribute="true">
<name>projectId</name>
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/test/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SFTPParseTest.java
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/test/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SFTPParseTest.java
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/test/java/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/SFTPParseTest.java
2010-12-14 22:31:05 UTC (rev 91)
@@ -100,6 +100,7 @@
// 5 - Multiple inserted group id
mapper = generateBasicMapper();
+ mapper.setAddDownloadSuffix(true);
mapper.setBaseDir("/home/test/five");
mapper.addExclude("**/ignore-file");
mapper.setBaseGroupId("net.sf.infix");
@@ -163,9 +164,7 @@
String repoMapContent = writer.toString();
// Log if enabled
- if (getLog().isDebugEnabled()) {
- getLog().debug(repoMapContent);
- }
+ getLog().info(repoMapContent);
// Assert Equals
XMLAssert.assertXMLEqual(XmlTestUtil.getNormalizedDocument(controlReader),
XmlTestUtil.getNormalizedDocument(new StringReader(repoMapContent)));
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T3Expected.xml
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T3Expected.xml
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T3Expected.xml
2010-12-14 22:31:05 UTC (rev 91)
@@ -4,7 +4,7 @@
<directories>
<directory nodeId="sf" name="sf">
<directories>
- <directory nodeId="infix"
name="infix">
+ <directory nodeId="infix"
name="infix" redirectBase="http://sourceforge.net/projects/mvn-infix/files/";>
<directories>
<directory
nodeId="infix-parent" name="infix-parent">
<directories>
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T4Expected.xml
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T4Expected.xml
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T4Expected.xml
2010-12-14 22:31:05 UTC (rev 91)
@@ -4,7 +4,7 @@
<directories>
<directory nodeId="sf" name="sf">
<directories>
- <directory nodeId="infix"
name="infix">
+ <directory nodeId="infix"
name="infix" redirectBase="http://sourceforge.net/projects/mvn-infix/files/";>
<directories>
<directory
nodeId="infix-parent" name="infix-parent">
<directories>
@@ -24,7 +24,7 @@
</directory>
<directory
nodeId="plugins" name="plugins">
<directories>
-
<directory nodeId="sfnet-mvnrepo-plugin" name="sfnet-mvnrepo-plugin">
+
<directory nodeId="sfnet-mvnrepo-plugin" name="sfnet-mvnrepo-plugin"
redirectBase="http://sourceforge.net/projects/mvn-infix/files/sfnet-mvnrepo-plugin/";>
<directories>
<directory nodeId="1.0" name="1.0">
<files>
Modified:
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T5Expected.xml
===================================================================
---
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T5Expected.xml
2010-12-12 01:05:33 UTC (rev 90)
+++
plugins/sfnet-mvnrepo-plugin/trunk/src/test/resources/com/mindtree/techworks/infix/plugins/sfnetmvnrepo/mapper/sfnetsftp/T5Expected.xml
2010-12-14 22:31:05 UTC (rev 91)
@@ -4,56 +4,56 @@
<directories>
<directory nodeId="sf" name="sf">
<directories>
- <directory nodeId="infix"
name="infix">
+ <directory nodeId="infix"
name="infix" redirectBase="http://sourceforge.net/projects/mvn-infix/files/";>
<directories>
<directory
nodeId="infix-parent" name="infix-parent">
<directories>
<directory nodeId="1.0" name="1.0">
<files>
-
<file nodeId="infix-parent-1.0-M1.pom"
name="infix-parent-1.0-M1.pom"/>
-
<file nodeId="infix-parent-1.0-M1.pom.md5"
name="infix-parent-1.0-M1.pom.md5"/>
-
<file nodeId="infix-parent-1.0-M1.pom.sha1"
name="infix-parent-1.0-M1.pom.sha1"/>
+
<file nodeId="infix-parent-1.0-M1.pom"
name="infix-parent-1.0-M1.pom" urlSuffix="/download"/>
+
<file nodeId="infix-parent-1.0-M1.pom.md5"
name="infix-parent-1.0-M1.pom.md5" urlSuffix="/download"/>
+
<file nodeId="infix-parent-1.0-M1.pom.sha1"
name="infix-parent-1.0-M1.pom.sha1" urlSuffix="/download"/>
</files>
</directory>
</directories>
<files>
-
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"/>
-
<file nodeId="maven-metadata.xml.md5" name="maven-metadata.xml.md5"/>
-
<file nodeId="maven-metadata.xml.sha1" name="maven-metadata.xml.sha1"/>
+
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"
urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.md5" name="maven-metadata.xml.md5"
urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.sha1" name="maven-metadata.xml.sha1"
urlSuffix="/download"/>
</files>
</directory>
<directory
nodeId="plugins" name="plugins">
<directories>
-
<directory nodeId="maven-nsis-plugin" name="maven-nsis-plugin">
+
<directory nodeId="maven-nsis-plugin" name="maven-nsis-plugin"
redirectBase="http://sourceforge.net/projects/mvn-infix/files/maven-nsis-plugin/";>
<directories>
<directory nodeId="1.0" name="1.0">
<files>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom"/>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"/>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom" urlSuffix="/download"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5" urlSuffix="/download"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1" urlSuffix="/download"/>
</files>
</directory>
</directories>
<files>
-
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"/>
-
<file nodeId="maven-metadata.xml.md5"
name="maven-metadata.xml.md5"/>
-
<file nodeId="maven-metadata.xml.sha1"
name="maven-metadata.xml.sha1"/>
+
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"
urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.md5"
name="maven-metadata.xml.md5" urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.sha1"
name="maven-metadata.xml.sha1" urlSuffix="/download"/>
</files>
</directory>
-
<directory nodeId="sfnet-mvnrepo-plugin" name="sfnet-mvnrepo-plugin">
+
<directory nodeId="sfnet-mvnrepo-plugin" name="sfnet-mvnrepo-plugin"
redirectBase="http://sourceforge.net/projects/mvn-infix/files/sfnet-mvnrepo-plugin/";>
<directories>
<directory nodeId="1.0" name="1.0">
<files>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom"/>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"/>
-
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom" urlSuffix="/download"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.md5" urlSuffix="/download"/>
+
<file
nodeId="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1"
name="sfnet-mvnrepo-plugin-0.1.0-M1.pom.sha1" urlSuffix="/download"/>
</files>
</directory>
</directories>
<files>
-
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"/>
-
<file nodeId="maven-metadata.xml.md5"
name="maven-metadata.xml.md5"/>
-
<file nodeId="maven-metadata.xml.sha1"
name="maven-metadata.xml.sha1"/>
+
<file nodeId="maven-metadata.xml" name="maven-metadata.xml"
urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.md5"
name="maven-metadata.xml.md5" urlSuffix="/download"/>
+
<file nodeId="maven-metadata.xml.sha1"
name="maven-metadata.xml.sha1" urlSuffix="/download"/>
</files>
</directory>
</directories>
Modified:
shared/infix-plugins-common/trunk/infix-test-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/test/PlexusTestCase.java
===================================================================
---
shared/infix-plugins-common/trunk/infix-test-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/test/PlexusTestCase.java
2010-12-12 01:05:33 UTC (rev 90)
+++
shared/infix-plugins-common/trunk/infix-test-utils/src/main/java/com/mindtree/techworks/infix/pluginscommon/test/PlexusTestCase.java
2010-12-14 22:31:05 UTC (rev 91)
@@ -31,7 +31,6 @@
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.DefaultContext;
import org.codehaus.plexus.logging.Logger;
@@ -172,99 +171,95 @@
}
protected Logger getLog () {
- try {
- return getContainer().lookup( Logger.class );
- } catch (ComponentLookupException e) {
- return new Logger() {
-
- @Override
- public void warn (String message, Throwable
throwable) {
- log.warn(message, throwable);
+ return new Logger() {
+
+ @Override
+ public void warn (String message, Throwable throwable) {
+ log.warn(message, throwable);
+ }
+ @Override
+ public void warn (String message) {
+ log.warn(message);
+ }
+ @Override
+ public void setThreshold (int threshold) {
+ // DO nothing
+ }
+ @Override
+ public boolean isWarnEnabled () {
+ return log.isWarnEnabled();
+ }
+ @Override
+ public boolean isInfoEnabled () {
+ return log.isInfoEnabled();
+ }
+ @Override
+ public boolean isFatalErrorEnabled () {
+ return isErrorEnabled();
+ }
+ @Override
+ public boolean isErrorEnabled () {
+ return log.isErrorEnabled();
+ }
+ @Override
+ public boolean isDebugEnabled () {
+ return log.isDebugEnabled();
+ }
+ @Override
+ public void info (String message, Throwable throwable) {
+ log.info(message, throwable);
+ }
+ @Override
+ public void info (String message) {
+ log.info(message);
+ }
+ @Override
+ public int getThreshold () {
+ if (isErrorEnabled()) {
+ return LEVEL_ERROR;
+ } else if (isWarnEnabled()) {
+ return LEVEL_WARN;
+ } else if (isInfoEnabled()) {
+ return LEVEL_INFO;
+ } else if (isDebugEnabled()){
+ return LEVEL_DEBUG;
}
- @Override
- public void warn (String message) {
- log.warn(message);
- }
- @Override
- public void setThreshold (int threshold) {
- // DO nothing
- }
- @Override
- public boolean isWarnEnabled () {
- return log.isWarnEnabled();
- }
- @Override
- public boolean isInfoEnabled () {
- return log.isInfoEnabled();
- }
- @Override
- public boolean isFatalErrorEnabled () {
- return isErrorEnabled();
- }
- @Override
- public boolean isErrorEnabled () {
- return log.isErrorEnabled();
- }
- @Override
- public boolean isDebugEnabled () {
- return log.isDebugEnabled();
- }
- @Override
- public void info (String message, Throwable
throwable) {
- log.info(message, throwable);
- }
- @Override
- public void info (String message) {
- log.info(message);
- }
- @Override
- public int getThreshold () {
- if (isErrorEnabled()) {
- return LEVEL_ERROR;
- } else if (isWarnEnabled()) {
- return LEVEL_WARN;
- } else if (isInfoEnabled()) {
- return LEVEL_INFO;
- } else if (isDebugEnabled()){
- return LEVEL_DEBUG;
- }
-
- return LEVEL_DISABLED;
- }
- @Override
- public String getName () {
- return "";
- }
- @Override
- public Logger getChildLogger (String name) {
- return this;
- }
- @Override
- public void fatalError (String message,
Throwable throwable) {
- log.error(message, throwable);
- }
- @Override
- public void fatalError (String message) {
- log.error(message);
- }
- @Override
- public void error (String message, Throwable
throwable) {
- log.error(message, throwable);
- }
- @Override
- public void error (String message) {
- log.error(message);
- }
- @Override
- public void debug (String message, Throwable
throwable) {
- log.debug(message, throwable);
- }
- @Override
- public void debug (String message) {
- log.debug(message);
- }
- };
- }
+
+ return LEVEL_DISABLED;
+ }
+ @Override
+ public String getName () {
+ return "";
+ }
+ @Override
+ public Logger getChildLogger (String name) {
+ return this;
+ }
+ @Override
+ public void fatalError (String message, Throwable
throwable) {
+ log.error(message, throwable);
+ }
+ @Override
+ public void fatalError (String message) {
+ log.error(message);
+ }
+ @Override
+ public void error (String message, Throwable throwable)
{
+ log.error(message, throwable);
+ }
+ @Override
+ public void error (String message) {
+ log.error(message);
+ }
+ @Override
+ public void debug (String message, Throwable throwable)
{
+ log.debug(message, throwable);
+ }
+ @Override
+ public void debug (String message) {
+ log.debug(message);
+ }
+ };
}
protected MojoInfo getMojoInfo () {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
mvn-Infix-commits mailing list
mvn-Infix-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mvn-infix-commits
