Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Sun Jan 11 01:52:08 2009 @@ -36,7 +36,7 @@
-

+

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp ('svn:executable' removed) Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp Sun Jan 11 01:52:08 2009 @@ -30,14 +30,13 @@

- +
-

+

@@ -81,4 +80,10 @@
+ + Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp ('svn:executable' removed) Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Sun Jan 11 01:52:08 2009 @@ -19,36 +19,37 @@ <%@ taglib prefix="s" uri="/struts-tags" %> + - Edit Company POM + <s:text name="companyPom.page.title"/> -

Company POM

+

- - + + - Version + - (The version will automatically be incremented when you save this form) + () -

Organization

+

- - + + <%-- TODO: how to get it to be a string, not a String[]? --%> - - + +
- - \ No newline at end of file +
+ Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Sun Jan 11 01:52:08 2009 @@ -37,11 +37,11 @@
-

Action Error

+

+

+ +

-

- -

@@ -83,13 +83,13 @@ width="100%" autoIncludeParameters="false"> - + "> () - + &installationId="> " alt="" title="" border="0" /> Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Sun Jan 11 01:52:08 2009 @@ -35,7 +35,7 @@
-

+

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Sun Jan 11 01:52:08 2009 @@ -42,10 +42,10 @@ sortable="false" filterable="false"> - - - - + + + +
"> Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Sun Jan 11 01:52:08 2009 @@ -31,7 +31,7 @@
-

+

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Sun Jan 11 01:52:08 2009 @@ -36,7 +36,7 @@
-

+

@@ -50,8 +50,8 @@ sortable="false" filterable="false"> - - + +
- +
This Component Failed to Render
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Sun Jan 11 01:52:08 2009 @@ -24,7 +24,7 @@ <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %> -

Project Group Notifiers of ${projectGroup.name} group

+

${projectGroup.name}

-

Project Notifiers

+

- + ${pageScope.projectNotifierSummary.projectId} Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp ('svn:executable' removed) Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp ('svn:executable' removed) Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Sun Jan 11 01:52:08 2009 @@ -32,19 +32,19 @@ " media="screen"/> " type="image/x-icon"/> - + " marginwidth="0" marginheight="0" class="composite"> -<%@ include file="/WEB-INF/jsp/navigations/DefaultTop.jsp" %> +


- <%@ include file="/WEB-INF/jsp/navigations/Menu.jsp" %> +

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Sun Jan 11 01:52:08 2009 @@ -35,7 +35,7 @@
-

+

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Sun Jan 11 01:52:08 2009 @@ -187,7 +187,7 @@
-
Legend
+
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Sun Jan 11 01:52:08 2009 @@ -64,8 +64,8 @@ - - + +
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Sun Jan 11 01:52:08 2009 @@ -63,8 +63,8 @@ - - + +
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Sun Jan 11 01:52:08 2009 @@ -58,8 +58,8 @@ - - + +
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Sun Jan 11 01:52:08 2009 @@ -58,8 +58,8 @@ - - + +
Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Sun Jan 11 01:52:08 2009 @@ -35,7 +35,7 @@
-

+

Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Sun Jan 11 01:52:08 2009 @@ -40,7 +40,7 @@
-

+

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Sun Jan 11 01:52:08 2009 @@ -96,7 +96,7 @@
-

+

-

+

Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp (original) +++ continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp Sun Jan 11 01:52:08 2009 @@ -21,17 +21,14 @@ - <ww:text name="scmResult.page.title"/> + <s:text name="scmResult.page.title"/>
- -

- +

-
Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: continuum/branches/continuum-distributed-builds/continuum-webapp/src/test/resources/log4j.xml ('svn:executable' removed) Modified: continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java (original) +++ continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ConfiguredBeanProcessorFactory.java Sun Jan 11 01:52:08 2009 @@ -30,6 +30,8 @@ import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.HashMap; import java.util.Iterator; @@ -43,16 +45,13 @@ public class ConfiguredBeanProcessorFactory implements RequestProcessorFactoryFactory, Initializable, Contextualizable { + private Logger log = LoggerFactory.getLogger( ConfiguredBeanProcessorFactory.class ); + /** * @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent" */ private Map xmlrpcComponents; - /** - * @plexus.requirement - */ - private Listener listener; - private Map componentsMapping = new HashMap(); PlexusContainer container; @@ -91,7 +90,7 @@ protected Object getRequestProcessor( Class cls ) throws XmlRpcException { - listener.getLogger().debug( "Load '" + cls.getName() + "' handler." ); + log.debug( "Load '" + cls.getName() + "' handler." ); Object obj = null; try @@ -100,7 +99,7 @@ } catch ( ComponentLookupException e ) { - listener.getLogger().error( "Can't load component.", e ); + log.error( "Can't load component.", e ); } if ( obj == null ) @@ -120,7 +119,7 @@ throws ComponentLookupException { String key = getComponentKey( cls ); - listener.getLogger().debug( "load component:" ); + log.debug( "load component:" + key ); return container.lookup( ContinuumXmlRpcComponent.class.getName(), key ); } Modified: continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java (original) +++ continuum/branches/continuum-distributed-builds/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/PropertiesHandlerMapping.java Sun Jan 11 01:52:08 2009 @@ -28,6 +28,8 @@ import org.codehaus.plexus.context.Context; import org.codehaus.plexus.context.ContextException; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.lang.reflect.Method; import java.util.Iterator; @@ -42,16 +44,13 @@ extends PropertyHandlerMapping implements Contextualizable { + private Logger log = LoggerFactory.getLogger( PropertiesHandlerMapping.class ); + /** * @plexus.requirement role="org.apache.maven.continuum.xmlrpc.server.ContinuumXmlRpcComponent" */ private Map xmlrpcComponents; - /** - * @plexus.requirement - */ - private Listener listener; - private PlexusContainer container; public void load() @@ -61,17 +60,20 @@ { String key = (String) i.next(); Class cl = xmlrpcComponents.get( key ).getClass(); - listener.getLogger().debug( key + " => " + cl.getName() ); + if ( log.isDebugEnabled() ) + { + log.debug( key + " => " + cl.getName() ); + } registerPublicMethods( key, cl ); } - if ( listener.getLogger().isDebugEnabled() ) + if ( log.isDebugEnabled() ) { String[] methods = getListMethods(); for ( int i = 0; i < methods.length; i++ ) { - listener.getLogger().debug( methods[i] ); + log.debug( methods[i] ); } } } Modified: continuum/branches/continuum-distributed-builds/pom.xml URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/pom.xml?rev=733441&r1=733440&r2=733441&view=diff ============================================================================== --- continuum/branches/continuum-distributed-builds/pom.xml (original) +++ continuum/branches/continuum-distributed-builds/pom.xml Sun Jan 11 01:52:08 2009 @@ -734,7 +734,7 @@ org.apache.httpcomponents httpclient - 4.0-beta1 + 4.0-beta2 org.codehaus.plexus @@ -765,13 +765,14 @@ org.slf4j slf4j-api - 1.5.0 + ${slf4jVersion} org.slf4j slf4j-log4j12 - 1.5.0 + ${slf4jVersion} + org.codehaus.plexus plexus-taskqueue @@ -815,7 +816,7 @@ org.apache.struts struts2-core - 2.0.12 + 2.0.14 commons-logging @@ -826,7 +827,7 @@ org.apache.struts struts2-spring-plugin - 2.0.12 + 2.0.14 commons-logging @@ -837,7 +838,7 @@ com.opensymphony xwork - 2.0.6 + 2.0.7