You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [18/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/a...
Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/META-INF/plexus/application.xml Mon Aug 13 04:29:09 2012
@@ -19,10 +19,10 @@
-->
<plexus>
<components>
-
+
<!--
- | Logger manager
- -->
+ | Logger manager
+ -->
<component>
<role>org.codehaus.plexus.logging.LoggerManager</role>
<implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation>
@@ -30,7 +30,7 @@
</component>
</components>
-
+
<lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager">
<default-lifecycle-handler-id>plexus</default-lifecycle-handler-id>
<lifecycle-handlers>
Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/applicationContext.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/applicationContext.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/resources/applicationContext.xml Mon Aug 13 04:29:09 2012
@@ -4,9 +4,11 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
- <bean id="masterBuildAgentTransportServer" class="org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportServer"/>
-
- <bean id="slaveBuildAgentTransportServer" class="org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportServer">
+ <bean id="masterBuildAgentTransportServer"
+ class="org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportServer"/>
+
+ <bean id="slaveBuildAgentTransportServer"
+ class="org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportServer">
<constructor-arg ref="continuumBuildAgentService"/>
</bean>
@@ -18,5 +20,5 @@
</list>
</constructor-arg>
</bean>
-
+
</beans>
Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/webapp/WEB-INF/web.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/main/webapp/WEB-INF/web.xml Mon Aug 13 04:29:09 2012
@@ -3,21 +3,21 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Continuum Distributed Build Transport Tests</display-name>
-
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
-
+
<listener>
<!-- TODO: some Spring technique for this? -->
- <listener-class>org.apache.continuum.web.startup.BuildAgentStartup</listener-class>
+ <listener-class>org.apache.continuum.web.startup.BuildAgentStartup</listener-class>
</listener>
-
+
<context-param>
<param-name>contextClass</param-name>
<param-value>org.codehaus.plexus.spring.PlexusWebApplicationContext</param-value>
</context-param>
-
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
@@ -27,7 +27,7 @@
classpath*:/META-INF/plexus/application.xml
</param-value>
</context-param>
-
+
<servlet>
<servlet-name>MasterXmlRpcServlet</servlet-name>
<servlet-class>
@@ -43,7 +43,7 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet>
<servlet-name>SlaveXmlRpcServlet</servlet-name>
<servlet-class>
@@ -59,12 +59,12 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>MasterXmlRpcServlet</servlet-name>
<url-pattern>/master-xmlrpc</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>SlaveXmlRpcServlet</servlet-name>
<url-pattern>/slave-xmlrpc</url-pattern>
Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/MasterBuildAgentTransportServiceTest.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,16 @@ package org.apache.continuum.distributed
* under the License.
*/
-import java.net.URL;
-import java.util.HashMap;
-
import junit.framework.TestCase;
-
import org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportClient;
import org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportService;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.ClassPathResource;
+import java.net.URL;
+import java.util.HashMap;
+
/**
* MasterBuildAgentTransportServiceTest
*/
@@ -37,17 +36,18 @@ public class MasterBuildAgentTransportSe
extends TestCase
{
private MasterBuildAgentTransportService masterProxy;
-
+
private BeanFactory beanFactory = new XmlBeanFactory( new ClassPathResource( "applicationContext.xml" ) );
-
+
protected void setUp()
throws Exception
{
super.setUp();
-
- masterProxy = new MasterBuildAgentTransportClient( new URL( "http://localhost:9191/master-xmlrpc"), null , null );
+
+ masterProxy = new MasterBuildAgentTransportClient( new URL( "http://localhost:9191/master-xmlrpc" ), null,
+ null );
}
-
+
public void testReturnBuildResult()
{
try
@@ -59,7 +59,7 @@ public class MasterBuildAgentTransportSe
fail( e.getMessage() );
}
}
-
+
public void testReturnScmResult()
{
try
Modified: continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-tests/src/test/it/org/apache/continuum/distributed/transport/tests/SlaveBuildAgentTransportServiceTest.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,16 @@ package org.apache.continuum.distributed
* under the License.
*/
-import java.net.URL;
-import java.util.Collections;
-
import junit.framework.TestCase;
-
import org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportClient;
import org.apache.continuum.distributed.transport.slave.SlaveBuildAgentTransportService;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.ClassPathResource;
+import java.net.URL;
+import java.util.Collections;
+
/**
* SlaveBuildAgentTransportServiceTest
*/
@@ -37,15 +36,15 @@ public class SlaveBuildAgentTransportSer
extends TestCase
{
private SlaveBuildAgentTransportService slaveProxy;
-
+
private BeanFactory beanFactory = new XmlBeanFactory( new ClassPathResource( "applicationContext.xml" ) );
-
+
protected void setUp()
throws Exception
{
super.setUp();
-
- slaveProxy = new SlaveBuildAgentTransportClient( new URL( "http://localhost:9191/slave-xmlrpc"), null , null );
+
+ slaveProxy = new SlaveBuildAgentTransportClient( new URL( "http://localhost:9191/slave-xmlrpc" ), null, null );
}
public void testBuildProjects()
@@ -107,7 +106,7 @@ public class SlaveBuildAgentTransportSer
fail( e.getMessage() );
}
}
-
+
public void testExecuteDirectoryPurge()
{
try
Modified: continuum/trunk/continuum-distributed/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/pom.xml (original)
+++ continuum/trunk/continuum-distributed/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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.apache.continuum</groupId>
<artifactId>continuum</artifactId>
Modified: continuum/trunk/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/pom.xml (original)
+++ continuum/trunk/continuum-docs/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.continuum</groupId>
Modified: continuum/trunk/continuum-docs/src/site/pdf.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/pdf.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/pdf.xml (original)
+++ continuum/trunk/continuum-docs/src/site/pdf.xml Mon Aug 13 04:29:09 2012
@@ -20,77 +20,77 @@
<document outputName="apache-continuum">
- <meta>
- <title>Apache Continuum ${project.version}</title>
- <author>The Apache Continuum Project</author>
- </meta>
-
- <toc name="Documentation">
- <item name="Index (category)" ref="index.html"/>
- <item name="Getting Started" ref="getting-started.html"/>
-
- <item name="Installation/Upgrade Guides" ref="installation/index.html"/>
- <item name="System Requirements" ref="installation/requirements.html"/>
- <item name="Installation" ref="installation/installation.html"/>
- <item name="Standalone" ref="installation/standalone.html"/>
- <item name="Tomcat" ref="installation/tomcat.html"/>
- <item name="Upgrade" ref="installation/upgrade.html"/>
-
- <item name="User's Guides" ref="user_guides/index.html"/>
- <item name="Managing Projects" ref="user_guides/managing_project/index.html"/>
- <item name="Add a Project" ref="user_guides/managing_project/addProject.html"/>
- <item name="Edit a Project" ref="user_guides/managing_project/editProject.html"/>
- <item name="Remove a Project" ref="user_guides/managing_project/removeProject.html"/>
- <item name="Managing Build Definitions" ref="user_guides/managing_builddef/index.html"/>
- <item name="Project Build Definition" ref="user_guides/managing_builddef/builddefProject.html"/>
- <item name="Project Group Build Definition" ref="user_guides/managing_builddef/builddefGroup.html"/>
- <item name="Managing Notification" ref="user_guides/notification/index.html"/>
- <item name="Mail Notification" ref="user_guides/notification/mail.html"/>
- <item name="IRC Notification" ref="user_guides/notification/irc.html"/>
- <item name="Jabber Notification" ref="user_guides/notification/jabber.html"/>
- <item name="MSN Notification" ref="user_guides/notification/msn.html"/>
- <item name="Wagon Notification" ref="user_guides/notification/wagon.html"/>
- <item name="Building a project" ref="user_guides/building_project/index.html"/>
- <item name="Scheduled Build" ref="user_guides/building_project/schedule_build.html"/>
- <item name="Forced Build" ref="user_guides/building_project/forced_build.html"/>
- <item name="Build Results Management" ref="user_guides/building_project/build_results.html"/>
- <item name="Release Management" ref="user_guides/release/index.html"/>
- <item name="Prepare Project Release" ref="user_guides/release/prepare.html"/>
- <item name="Perform Project Release" ref="user_guides/release/perform.html"/>
- <item name="Release Results Management" ref="user_guides/release/release_results.html"/>
-
- <item name="Administrator's Guides" ref="administrator_guides/index.html"/>
- <item name="Managing Users and Security" ref="administrator_guides/security/index.html"/>
- <item name="Security Configuration" ref="administrator_guides/security/customising-security.html"/>
- <item name="LDAP Configuration" ref="administrator_guides/security/ldap.html"/>
- <item name="Managing Project Groups" ref="administrator_guides/projectgroup.html"/>
- <item name="Managing Builders" ref="administrator_guides/builder.html"/>
- <item name="Managing JDKs" ref="administrator_guides/jdk.html"/>
- <item name="Managing Build Environments" ref="administrator_guides/profiles.html"/>
- <item name="Managing Schedules" ref="administrator_guides/schedules.html"/>
- <item name="Managing General Configuration" ref="administrator_guides/configuration.html"/>
- <item name="Managing Local Repositories" ref="administrator_guides/localRepository.html"/>
- <item name="Managing Purge Configuration" ref="administrator_guides/purgeConfiguration.html"/>
- <item name="Managing Parallel Builds" ref="administrator_guides/parallelBuilds.html"/>
- <item name="Managing Build Queues" ref="administrator_guides/buildQueue.html"/>
- <item name="Managing Build Agents" ref="administrator_guides/build-agents.html"/>
- <item name="Managing Build Agent Groups" ref="administrator_guides/build-agent-groups.html"/>
- <item name="Managing Project Queues" ref="administrator_guides/queues.html"/>
- <item name="External databases" ref="administrator_guides/external-db.html"/>
- <item name="Monitoring Continuum" ref="administrator_guides/monitoring.html"/>
- <item name="Log Files" ref="administrator_guides/logging.html"/>
- <item name="Audit Logs" ref="administrator_guides/audit-logs.html"/>
- <item name="Continuum Logs" ref="administrator_guides/continuum-logs.html"/>
- <item name="Security Logs" ref="administrator_guides/security-logs.html"/>
- <item name="Appearance Configuration" ref="administrator_guides/appearance.html"/>
- <item name="Build Definition Template" ref="administrator_guides/builddefTemplate.html"/>
- <item name="Shutdown Continuum" ref="administrator_guides/shutdown.html"/>
- <item name="Understanding Distributed Builds" ref="administrator_guides/distributed-builds.html"/>
-
- <item name="Developer's Guides" ref="developer_guides/index.html"/>
- <item name="Building Continuum" ref="developer_guides/building.html"/>
- <item name="XML-RPC" ref="developer_guides/xmlrpc.html"/>
+ <meta>
+ <title>Apache Continuum ${project.version}</title>
+ <author>The Apache Continuum Project</author>
+ </meta>
+
+ <toc name="Documentation">
+ <item name="Index (category)" ref="index.html"/>
+ <item name="Getting Started" ref="getting-started.html"/>
+
+ <item name="Installation/Upgrade Guides" ref="installation/index.html"/>
+ <item name="System Requirements" ref="installation/requirements.html"/>
+ <item name="Installation" ref="installation/installation.html"/>
+ <item name="Standalone" ref="installation/standalone.html"/>
+ <item name="Tomcat" ref="installation/tomcat.html"/>
+ <item name="Upgrade" ref="installation/upgrade.html"/>
+
+ <item name="User's Guides" ref="user_guides/index.html"/>
+ <item name="Managing Projects" ref="user_guides/managing_project/index.html"/>
+ <item name="Add a Project" ref="user_guides/managing_project/addProject.html"/>
+ <item name="Edit a Project" ref="user_guides/managing_project/editProject.html"/>
+ <item name="Remove a Project" ref="user_guides/managing_project/removeProject.html"/>
+ <item name="Managing Build Definitions" ref="user_guides/managing_builddef/index.html"/>
+ <item name="Project Build Definition" ref="user_guides/managing_builddef/builddefProject.html"/>
+ <item name="Project Group Build Definition" ref="user_guides/managing_builddef/builddefGroup.html"/>
+ <item name="Managing Notification" ref="user_guides/notification/index.html"/>
+ <item name="Mail Notification" ref="user_guides/notification/mail.html"/>
+ <item name="IRC Notification" ref="user_guides/notification/irc.html"/>
+ <item name="Jabber Notification" ref="user_guides/notification/jabber.html"/>
+ <item name="MSN Notification" ref="user_guides/notification/msn.html"/>
+ <item name="Wagon Notification" ref="user_guides/notification/wagon.html"/>
+ <item name="Building a project" ref="user_guides/building_project/index.html"/>
+ <item name="Scheduled Build" ref="user_guides/building_project/schedule_build.html"/>
+ <item name="Forced Build" ref="user_guides/building_project/forced_build.html"/>
+ <item name="Build Results Management" ref="user_guides/building_project/build_results.html"/>
+ <item name="Release Management" ref="user_guides/release/index.html"/>
+ <item name="Prepare Project Release" ref="user_guides/release/prepare.html"/>
+ <item name="Perform Project Release" ref="user_guides/release/perform.html"/>
+ <item name="Release Results Management" ref="user_guides/release/release_results.html"/>
+
+ <item name="Administrator's Guides" ref="administrator_guides/index.html"/>
+ <item name="Managing Users and Security" ref="administrator_guides/security/index.html"/>
+ <item name="Security Configuration" ref="administrator_guides/security/customising-security.html"/>
+ <item name="LDAP Configuration" ref="administrator_guides/security/ldap.html"/>
+ <item name="Managing Project Groups" ref="administrator_guides/projectgroup.html"/>
+ <item name="Managing Builders" ref="administrator_guides/builder.html"/>
+ <item name="Managing JDKs" ref="administrator_guides/jdk.html"/>
+ <item name="Managing Build Environments" ref="administrator_guides/profiles.html"/>
+ <item name="Managing Schedules" ref="administrator_guides/schedules.html"/>
+ <item name="Managing General Configuration" ref="administrator_guides/configuration.html"/>
+ <item name="Managing Local Repositories" ref="administrator_guides/localRepository.html"/>
+ <item name="Managing Purge Configuration" ref="administrator_guides/purgeConfiguration.html"/>
+ <item name="Managing Parallel Builds" ref="administrator_guides/parallelBuilds.html"/>
+ <item name="Managing Build Queues" ref="administrator_guides/buildQueue.html"/>
+ <item name="Managing Build Agents" ref="administrator_guides/build-agents.html"/>
+ <item name="Managing Build Agent Groups" ref="administrator_guides/build-agent-groups.html"/>
+ <item name="Managing Project Queues" ref="administrator_guides/queues.html"/>
+ <item name="External databases" ref="administrator_guides/external-db.html"/>
+ <item name="Monitoring Continuum" ref="administrator_guides/monitoring.html"/>
+ <item name="Log Files" ref="administrator_guides/logging.html"/>
+ <item name="Audit Logs" ref="administrator_guides/audit-logs.html"/>
+ <item name="Continuum Logs" ref="administrator_guides/continuum-logs.html"/>
+ <item name="Security Logs" ref="administrator_guides/security-logs.html"/>
+ <item name="Appearance Configuration" ref="administrator_guides/appearance.html"/>
+ <item name="Build Definition Template" ref="administrator_guides/builddefTemplate.html"/>
+ <item name="Shutdown Continuum" ref="administrator_guides/shutdown.html"/>
+ <item name="Understanding Distributed Builds" ref="administrator_guides/distributed-builds.html"/>
+
+ <item name="Developer's Guides" ref="developer_guides/index.html"/>
+ <item name="Building Continuum" ref="developer_guides/building.html"/>
+ <item name="XML-RPC" ref="developer_guides/xmlrpc.html"/>
- </toc>
+ </toc>
</document>
Modified: continuum/trunk/continuum-docs/src/site/resources/pdf-config.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/resources/pdf-config.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/resources/pdf-config.xml (original)
+++ continuum/trunk/continuum-docs/src/site/resources/pdf-config.xml Mon Aug 13 04:29:09 2012
@@ -1,10 +1,11 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
- <xsl:attribute-set name="figure.graphics">
- <xsl:attribute name="height">100%</xsl:attribute>
- <xsl:attribute name="width">100%</xsl:attribute>
- <xsl:attribute name="content-height">scale-down-to-fit</xsl:attribute>
- <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
- </xsl:attribute-set>
+ <xsl:attribute-set name="figure.graphics">
+ <xsl:attribute name="height">100%</xsl:attribute>
+ <xsl:attribute name="width">100%</xsl:attribute>
+ <xsl:attribute name="content-height">scale-down-to-fit</xsl:attribute>
+ <xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+ </xsl:attribute-set>
</xsl:stylesheet>
Modified: continuum/trunk/continuum-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/site.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/site.xml (original)
+++ continuum/trunk/continuum-docs/src/site/site.xml Mon Aug 13 04:29:09 2012
@@ -21,7 +21,7 @@
<project name="Apache Continuum">
<body>
<breadcrumbs>
- <item name="${project.version}" href="/" />
+ <item name="${project.version}" href="/"/>
</breadcrumbs>
<menu name="Documentation">
@@ -82,7 +82,8 @@
<item name="Managing JDKs" href="administrator_guides/jdk.html"/>
<item name="Managing Build Environments" href="administrator_guides/buildEnvironment.html"/>
<item name="Managing Schedules" href="administrator_guides/schedules.html"/>
- <item name="Managing General Configuration" href="administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
+ <item name="Managing General Configuration" href="administrator_guides/configuration.html"/>
+ <!-- (configuration and appearance) -->
<item name="Managing Local Repositories" href="administrator_guides/localRepository.html"/>
<item name="Managing Purge Configuration" href="administrator_guides/purgeConfiguration.html"/>
<item name="Managing Parallel Builds" href="administrator_guides/parallelBuilds.html">
@@ -94,9 +95,9 @@
<item name="External databases" href="administrator_guides/external-db.html"/>
<item name="Monitoring Continuum" href="administrator_guides/monitoring.html"/>
<item name="Log Files" href="administrator_guides/logging.html" collapse="true">
- <item name="Audit Logs" href="administrator_guides/audit-logs.html" />
- <item name="Continuum Logs" href="administrator_guides/continuum-logs.html" />
- <item name="Security Logs" href="administrator_guides/security-logs.html" />
+ <item name="Audit Logs" href="administrator_guides/audit-logs.html"/>
+ <item name="Continuum Logs" href="administrator_guides/continuum-logs.html"/>
+ <item name="Security Logs" href="administrator_guides/security-logs.html"/>
</item>
<item name="Appearance Configuration" href="administrator_guides/appearance.html"/>
<item name="Build Definition Template" href="administrator_guides/builddefTemplate.html"/>
Modified: continuum/trunk/continuum-docs/src/site/xdoc/release-notes.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/xdoc/release-notes.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-docs/src/site/xdoc/release-notes.xml (original)
+++ continuum/trunk/continuum-docs/src/site/xdoc/release-notes.xml Mon Aug 13 04:29:09 2012
@@ -1,120 +1,162 @@
<document>
<properties>
<title>Release Notes</title>
- </properties>
-<body>
+ </properties>
+ <body>
- <h2>Apache Continuum 1.4.0 Release Notes</h2>
-
- <p>The Apache Continuum team is pleased to announce Apache Continuum 1.4.0.</p>
-
- <p>This release includes the following new features:</p>
-
- <p><b>Improved user recognition</b> - information on who executed releases and forced builds, and better handling of sending notifications to developers who made a change</p>
-
- <p>To learn more about how the Continuum dev team versions releases, see our
- <a href="http://continuum.apache.org/development/release.html">release guidelines</a>.</p>
-
-<h2> Bug
-</h2>
-<ul>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1578'>CONTINUUM-1578</a>] - No output after a successful perform release
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2114'>CONTINUUM-2114</a>] - cannot login with perforce scm until new version of scm is included
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2170'>CONTINUUM-2170</a>] - No such object error when forcing a build from the group-level Build Definitions tab
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2267'>CONTINUUM-2267</a>] - Error with backslash in Windows path for inatallation tests
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2270'>CONTINUUM-2270</a>] - Selenium tests fail when run with JDK 1.6
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2285'>CONTINUUM-2285</a>] - Queues page turns to blank if build queues are not empty
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2349'>CONTINUUM-2349</a>] - Project should only build in agents that are in the Build agent group assigned to it
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2371'>CONTINUUM-2371</a>] - Unable to view queues after loss of build agent
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2381'>CONTINUUM-2381</a>] - Project is not building even when there is an enabled build agent configured
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2386'>CONTINUUM-2386</a>] - Build environment selection is ignored when releasing with distributed build enabled
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2391'>CONTINUUM-2391</a>] - Master should not pass full path to local repository to the agent
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2395'>CONTINUUM-2395</a>] - Build Environment accepts duplicate name during edit
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2397'>CONTINUUM-2397</a>] - Unable to edit the added local repository
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2440'>CONTINUUM-2440</a>] - Unable to download html file from working copy
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2450'>CONTINUUM-2450</a>] - Intermittent error when releasing in a distributed build
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2451'>CONTINUUM-2451</a>] - Unable to release a project using the "provide parameters" option with distributed builds
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2466'>CONTINUUM-2466</a>] - authorization failed when building ant / shell projects
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2474'>CONTINUUM-2474</a>] - Fix selenium failing test in windows
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2476'>CONTINUUM-2476</a>] - Projects are not built in the correct build agent when the project is already in the build queue and then triggered to be built again
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2479'>CONTINUUM-2479</a>] - Link to cron-help is wrong
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2487'>CONTINUUM-2487</a>] - Selenium tests fail if run at certain times crossing the 'on the hour' default schedule trigger
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2490'>CONTINUUM-2490</a>] - Getting permission denied when running selenium tests in IE
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2493'>CONTINUUM-2493</a>] - "Users Wiki" link on home page points at old wiki
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2494'>CONTINUUM-2494</a>] - Unable to build a project even though the build agent is there.
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2504'>CONTINUUM-2504</a>] - Queues page shows distributedBuild.table.agentUrl for the Agent URL field instead of the actual value
-</li>
-</ul>
-
-<h2> Improvement
-</h2>
-<ul>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-493'>CONTINUUM-493</a>] - Allow to add all developpers address in a notifier without duplicate developpers addresses
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-565'>CONTINUUM-565</a>] - Forced builds should say who (which continuum user) forced the build
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2160'>CONTINUUM-2160</a>] - Upgrade to last scm version (1.2) and last release-manager version
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2373'>CONTINUUM-2373</a>] - Distributed Master needs more detailed logging
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2458'>CONTINUUM-2458</a>] - Continuum Release should do a checkout if there is no working copy
-</li>
-</ul>
-
-<h2> New Feature
-</h2>
-<ul>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2265'>CONTINUUM-2265</a>] - Need information on who executed a release
-</li>
-</ul>
-
-<h2> Task
-</h2>
-<ul>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2252'>CONTINUUM-2252</a>] - Add documentation for Selenium tests
-</li>
-</ul>
-
-<h2> Test
-</h2>
-<ul>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2073'>CONTINUUM-2073</a>] - Revive the automated Selenium integration tests
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2268'>CONTINUUM-2268</a>] - Continuum Webapp Tests Capture Screenshot for AbstractSeleniumTest.java
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2271'>CONTINUUM-2271</a>] - Continuum Build Agent Tests and Improvement on Build Queue Test
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2378'>CONTINUUM-2378</a>] - Selenium Test for deleting projects and project groups
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2467'>CONTINUUM-2467</a>] - Selenium test: check for project group SCM update when building projects
-</li>
-<li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2482'>CONTINUUM-2482</a>] - Replace the use of Thread.sleep to Selenium waitForCondition
-</li>
-</ul>
+ <h2>Apache Continuum 1.4.0 Release Notes</h2>
-</body>
+ <p>The Apache Continuum team is pleased to announce Apache Continuum 1.4.0.</p>
+
+ <p>This release includes the following new features:</p>
+
+ <p>
+ <b>Improved user recognition</b>
+ - information on who executed releases and forced builds, and better handling of sending notifications to
+ developers who made a change
+ </p>
+
+ <p>To learn more about how the Continuum dev team versions releases, see our
+ <a href="http://continuum.apache.org/development/release.html">release guidelines</a>.
+ </p>
+
+ <h2>Bug
+ </h2>
+ <ul>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-1578'>CONTINUUM-1578</a>] - No output after a successful
+ perform release
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2114'>CONTINUUM-2114</a>] - cannot login with perforce scm
+ until new version of scm is included
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2170'>CONTINUUM-2170</a>] - No such object error when
+ forcing a build from the group-level Build Definitions tab
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2267'>CONTINUUM-2267</a>] - Error with backslash in
+ Windows path for inatallation tests
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2270'>CONTINUUM-2270</a>] - Selenium tests fail when run
+ with JDK 1.6
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2285'>CONTINUUM-2285</a>] - Queues page turns to blank if
+ build queues are not empty
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2349'>CONTINUUM-2349</a>] - Project should only build in
+ agents that are in the Build agent group assigned to it
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2371'>CONTINUUM-2371</a>] - Unable to view queues after
+ loss of build agent
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2381'>CONTINUUM-2381</a>] - Project is not building even
+ when there is an enabled build agent configured
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2386'>CONTINUUM-2386</a>] - Build environment selection is
+ ignored when releasing with distributed build enabled
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2391'>CONTINUUM-2391</a>] - Master should not pass full
+ path to local repository to the agent
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2395'>CONTINUUM-2395</a>] - Build Environment accepts
+ duplicate name during edit
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2397'>CONTINUUM-2397</a>] - Unable to edit the added local
+ repository
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2440'>CONTINUUM-2440</a>] - Unable to download html file
+ from working copy
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2450'>CONTINUUM-2450</a>] - Intermittent error when
+ releasing in a distributed build
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2451'>CONTINUUM-2451</a>] - Unable to release a project
+ using the "provide parameters" option with distributed builds
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2466'>CONTINUUM-2466</a>] - authorization failed when
+ building ant / shell projects
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2474'>CONTINUUM-2474</a>] - Fix selenium failing test in
+ windows
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2476'>CONTINUUM-2476</a>] - Projects are not built in the
+ correct build agent when the project is already in the build queue and then triggered to be built again
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2479'>CONTINUUM-2479</a>] - Link to cron-help is wrong
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2487'>CONTINUUM-2487</a>] - Selenium tests fail if run at
+ certain times crossing the 'on the hour' default schedule trigger
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2490'>CONTINUUM-2490</a>] - Getting permission denied when
+ running selenium tests in IE
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2493'>CONTINUUM-2493</a>] - "Users Wiki" link on
+ home page points at old wiki
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2494'>CONTINUUM-2494</a>] - Unable to build a project even
+ though the build agent is there.
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2504'>CONTINUUM-2504</a>] - Queues page shows
+ distributedBuild.table.agentUrl for the Agent URL field instead of the actual value
+ </li>
+ </ul>
+
+ <h2>Improvement
+ </h2>
+ <ul>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-493'>CONTINUUM-493</a>] - Allow to add all developpers
+ address in a notifier without duplicate developpers addresses
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-565'>CONTINUUM-565</a>] - Forced builds should say who
+ (which continuum user) forced the build
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2160'>CONTINUUM-2160</a>] - Upgrade to last scm version
+ (1.2) and last release-manager version
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2373'>CONTINUUM-2373</a>] - Distributed Master needs more
+ detailed logging
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2458'>CONTINUUM-2458</a>] - Continuum Release should do a
+ checkout if there is no working copy
+ </li>
+ </ul>
+
+ <h2>New Feature
+ </h2>
+ <ul>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2265'>CONTINUUM-2265</a>] - Need information on who
+ executed a release
+ </li>
+ </ul>
+
+ <h2>Task
+ </h2>
+ <ul>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2252'>CONTINUUM-2252</a>] - Add documentation for Selenium
+ tests
+ </li>
+ </ul>
+
+ <h2>Test
+ </h2>
+ <ul>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2073'>CONTINUUM-2073</a>] - Revive the automated Selenium
+ integration tests
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2268'>CONTINUUM-2268</a>] - Continuum Webapp Tests Capture
+ Screenshot for AbstractSeleniumTest.java
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2271'>CONTINUUM-2271</a>] - Continuum Build Agent Tests
+ and Improvement on Build Queue Test
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2378'>CONTINUUM-2378</a>] - Selenium Test for deleting
+ projects and project groups
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2467'>CONTINUUM-2467</a>] - Selenium test: check for
+ project group SCM update when building projects
+ </li>
+ <li>[<a href='http://jira.codehaus.org/browse/CONTINUUM-2482'>CONTINUUM-2482</a>] - Replace the use of
+ Thread.sleep to Selenium waitForCondition
+ </li>
+ </ul>
+
+ </body>
</document>
Modified: continuum/trunk/continuum-jetty/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/pom.xml (original)
+++ continuum/trunk/continuum-jetty/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>continuum</artifactId>
@@ -51,7 +52,7 @@ under the License.
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
<scope>runtime</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId>
@@ -70,7 +71,7 @@ under the License.
</dependencies>
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<configuration>
@@ -83,7 +84,7 @@ under the License.
</commandLineArguments>
<platforms>
<platform>jsw</platform>
- </platforms>
+ </platforms>
<generatorConfigurations>
<generatorConfiguration>
<generator>jsw</generator>
@@ -154,9 +155,9 @@ under the License.
<systemProperty>jetty.logs=%CONTINUUM_BASE%/logs</systemProperty>
<systemProperty>java.io.tmpdir=%CONTINUUM_BASE%/tmp</systemProperty>
</systemProperties>
- </jvmSettings>
+ </jvmSettings>
</daemon>
- </daemons>
+ </daemons>
<repoPath>lib</repoPath>
<repositoryLayout>flat</repositoryLayout>
<assembleDirectory>target/generated-resources/appassembler/jsw/continuum</assembleDirectory>
@@ -195,9 +196,9 @@ under the License.
<configuration>
<tasks>
<copy todir="target/generated-resources/appassembler/jsw/continuum/conf">
- <fileset dir="src/main/conf" />
+ <fileset dir="src/main/conf"/>
</copy>
- <mkdir dir="target/generated-resources/appassembler/jsw/continuum/logs" />
+ <mkdir dir="target/generated-resources/appassembler/jsw/continuum/logs"/>
</tasks>
</configuration>
<goals>
Modified: continuum/trunk/continuum-jetty/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/assembly/bin.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/assembly/bin.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/assembly/bin.xml Mon Aug 13 04:29:09 2012
@@ -24,7 +24,7 @@
<format>zip</format>
</formats>
<fileSets>
- <fileSet>
+ <fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/apps</directory>
<outputDirectory>apps</outputDirectory>
</fileSet>
@@ -40,7 +40,7 @@
<exclude>maven-metadata-appassembler.xml</exclude>
</excludes>
<fileMode>0755</fileMode>
- </fileSet>
+ </fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/logs</directory>
<outputDirectory>logs</outputDirectory>
@@ -48,8 +48,8 @@
<fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/bin</directory>
<outputDirectory>bin</outputDirectory>
- <includes>
- <include>continuum</include>
+ <includes>
+ <include>continuum</include>
</includes>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
@@ -57,20 +57,20 @@
<fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/bin</directory>
<outputDirectory>bin</outputDirectory>
- <includes>
- <include>wrapper-linux-x86-32</include>
- <include>wrapper-linux-x86-64</include>
- <include>wrapper-macosx-universal-32</include>
- <include>wrapper-solaris-x86-32</include>
- <include>wrapper-solaris-sparc-32</include>
- <include>wrapper-solaris-sparc-64</include>
+ <includes>
+ <include>wrapper-linux-x86-32</include>
+ <include>wrapper-linux-x86-64</include>
+ <include>wrapper-macosx-universal-32</include>
+ <include>wrapper-solaris-x86-32</include>
+ <include>wrapper-solaris-sparc-32</include>
+ <include>wrapper-solaris-sparc-64</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/bin</directory>
<outputDirectory>bin</outputDirectory>
- <includes>
+ <includes>
<include>continuum.bat</include>
</includes>
<fileMode>0755</fileMode>
@@ -79,7 +79,7 @@
<fileSet>
<directory>target/generated-resources/appassembler/jsw/continuum/bin</directory>
<outputDirectory>bin</outputDirectory>
- <includes>
+ <includes>
<include>wrapper-windows-x86-32.exe</include>
</includes>
<fileMode>0755</fileMode>
Modified: continuum/trunk/continuum-jetty/src/main/conf/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/conf/continuum.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/conf/continuum.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/conf/continuum.xml Mon Aug 13 04:29:09 2012
@@ -18,4 +18,4 @@ specific language governing permissions
under the License.
-->
-<continuum-configuration />
+<continuum-configuration/>
Modified: continuum/trunk/continuum-model/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-model/pom.xml (original)
+++ continuum/trunk/continuum-model/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -71,8 +72,8 @@ under the License.
<phase>process-resources</phase>
<configuration>
<tasks>
- <copy file="target/classes/META-INF/package.jdorepl" todir="target/classes" />
- <copy file="target/classes/META-INF/package.jdo" todir="target/classes" />
+ <copy file="target/classes/META-INF/package.jdorepl" todir="target/classes"/>
+ <copy file="target/classes/META-INF/package.jdo" todir="target/classes"/>
</tasks>
</configuration>
<goals>
Modified: continuum/trunk/continuum-model/src/main/java/org/apache/continuum/model/project/ProjectGroupSummary.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/java/org/apache/continuum/model/project/ProjectGroupSummary.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/java/org/apache/continuum/model/project/ProjectGroupSummary.java (original)
+++ continuum/trunk/continuum-model/src/main/java/org/apache/continuum/model/project/ProjectGroupSummary.java Mon Aug 13 04:29:09 2012
@@ -44,7 +44,7 @@ public class ProjectGroupSummary
{
return projectGroupId;
}
-
+
public void setProjectGroupId( int projectGroupId )
{
this.projectGroupId = projectGroupId;
Modified: continuum/trunk/continuum-model/src/main/mdo/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-model/src/main/mdo/continuum.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-model/src/main/mdo/continuum.xml (original)
+++ continuum/trunk/continuum-model/src/main/mdo/continuum.xml Mon Aug 13 04:29:09 2012
@@ -180,7 +180,8 @@
<version>1.0.9+</version>
<type>String</type>
</field>
- <field jpox.mapped-by="projectGroup" jpox.fetch-groups="projectgroup-projects project-build-details project-with-scm-result">
+ <field jpox.mapped-by="projectGroup"
+ jpox.fetch-groups="projectgroup-projects project-build-details project-with-scm-result">
<name>projects</name>
<version>1.0.9+</version>
<association jpox.join="false">
@@ -1005,7 +1006,7 @@
<name>type</name>
<version>1.1.0+</version>
<type>String</type>
- <description>type of the buid defintion</description>
+ <description>type of the buid defintion</description>
</field>
<field>
<name>schedule</name>
@@ -1083,8 +1084,8 @@
<name>type</name>
<version>1.1.0+</version>
<type>String</type>
- <description>type of the buid BuildDefinitionTemplate use for default</description>
- </field>
+ <description>type of the buid BuildDefinitionTemplate use for default</description>
+ </field>
<field xml.reference="true" stash.part="true" jpox.fetch-groups="build-template-build-definitions">
<name>buildDefinitions</name>
<version>1.1.0+</version>
@@ -1097,7 +1098,7 @@
</class>
<class>
<name>BuildQueue</name>
- <version>1.1.4+</version>
+ <version>1.1.4+</version>
<description><![CDATA[
Build queue.
]]></description>
@@ -1114,9 +1115,9 @@
<type>String</type>
<required>true</required>
<defaultValue></defaultValue>
- </field>
+ </field>
</fields>
- </class>
+ </class>
<class>
<name>Schedule</name>
<version>1.0.9+</version>
@@ -1230,7 +1231,7 @@
<type>String</type>
<required>false</required>
<defaultValue></defaultValue>
- </field>
+ </field>
<field>
<name>jdk</name>
<version>1.1.0+</version>
@@ -1417,8 +1418,8 @@
</fields>
<codeSegments>
<codeSegment>
- <version>1.1.0+</version>
- <code><![CDATA[
+ <version>1.1.0+</version>
+ <code><![CDATA[
public final static int NEW = 1;
public final static int OK = 2;
public final static int FAILED = 3;
@@ -1492,7 +1493,7 @@
<type>String</type>
<required>true</required>
<description>
- The file system location for this repository
+ The file system location for this repository
</description>
</field>
<field>
@@ -1501,12 +1502,12 @@
<type>String</type>
<defaultValue>default</defaultValue>
<description>
- The layout of the repository. Valid values are "default" and "legacy"
+ The layout of the repository. Valid values are "default" and "legacy"
</description>
</field>
</fields>
</class>
-
+
<class>
<name>AbstractPurgeConfiguration</name>
<version>1.1.1+</version>
@@ -1536,7 +1537,7 @@
<type>int</type>
<defaultValue>2</defaultValue>
<description>
- The total count of the artifact for each snapshot or the release/build output folder to be retained.
+ The total count of the artifact for each snapshot or the release/build output folder to be retained.
</description>
</field>
<field>
@@ -1545,7 +1546,7 @@
<type>int</type>
<defaultValue>100</defaultValue>
<description>
- The number of days old which will be the basis for removing a snapshot or a folder.
+ The number of days old which will be the basis for removing a snapshot or a folder.
</description>
</field>
<field>
@@ -1644,7 +1645,7 @@
</field>
</fields>
</class>
-
+
<class>
<name>ContinuumReleaseResult</name>
<version>1.1.2+</version>
@@ -1696,7 +1697,7 @@
<type>String</type>
</field>
</fields>
- </class>
+ </class>
<class>
<name>ProjectScmRoot</name>
@@ -1739,6 +1740,6 @@
<required>true</required>
</field>
</fields>
- </class>
+ </class>
</classes>
</model>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum-notifiers</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -34,10 +35,10 @@ under the License.
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-model</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/java/org/apache/maven/continuum/notification/AbstractContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.util.List;
-
-import javax.annotation.Resource;
-
import org.apache.continuum.configuration.ContinuumConfigurationException;
import org.apache.continuum.dao.BuildResultDao;
import org.apache.continuum.dao.ProjectDao;
@@ -42,6 +38,9 @@ import org.apache.maven.continuum.store.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.List;
+import javax.annotation.Resource;
+
public abstract class AbstractContinuumNotifier
implements Notifier
{
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-api/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.continuum.notification"/>
-
+
</beans>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum-notifiers</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -31,15 +32,15 @@ under the License.
<groupId>org.schwering</groupId>
<artifactId>irclib</artifactId>
<version>1.10</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -47,7 +47,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.annotation.Resource;
/**
@@ -55,9 +54,8 @@ import javax.annotation.Resource;
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
- *
*/
-@Service("notifier#irc")
+@Service( "notifier#irc" )
public class IrcContinuumNotifier
extends AbstractContinuumNotifier
implements Disposable
@@ -232,14 +230,14 @@ public class IrcContinuumNotifier
ProjectScmRoot projectScmRoot = context.getProjectScmRoot();
- boolean isPrepareBuildComplete =
- messageId.equals( ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
-
+ boolean isPrepareBuildComplete = messageId.equals(
+ ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
+
if ( projectScmRoot == null && isPrepareBuildComplete )
{
return;
}
-
+
// ----------------------------------------------------------------------
// If there wasn't any building done, don't notify
// ----------------------------------------------------------------------
@@ -298,9 +296,9 @@ public class IrcContinuumNotifier
{
return;
}
-
+
sendMessage( projectNotifier.getConfiguration(), generateMessage( projectScmRoot, configurationService ) );
- }
+ }
private void sendMessage( Map<String, String> configuration, String message )
throws NotificationException
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.continuum.notification.irc"/>
-
+
</beans>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum-notifiers</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -30,11 +31,11 @@ under the License.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -42,11 +36,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
-@Service("notifier#jabber")
+@Service( "notifier#jabber" )
public class JabberContinuumNotifier
extends AbstractContinuumNotifier
{
@@ -115,8 +114,8 @@ public class JabberContinuumNotifier
BuildResult build = context.getBuildResult();
ProjectScmRoot projectScmRoot = context.getProjectScmRoot();
- boolean isPrepareBuildComplete =
- messageId.equals( ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
+ boolean isPrepareBuildComplete = messageId.equals(
+ ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
if ( projectScmRoot == null && isPrepareBuildComplete )
{
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-jabber/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.continuum.notification.jabber"/>
-
+
</beans>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum-notifiers</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -45,11 +46,11 @@ under the License.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-model</artifactId>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -42,11 +36,16 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
*/
-@Service("notifier#msn")
+@Service( "notifier#msn" )
public class MsnContinuumNotifier
extends AbstractContinuumNotifier
{
@@ -102,8 +101,8 @@ public class MsnContinuumNotifier
ProjectScmRoot projectScmRoot = context.getProjectScmRoot();
- boolean isPrepareBuildComplete =
- messageId.equals( ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
+ boolean isPrepareBuildComplete = messageId.equals(
+ ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
if ( projectScmRoot == null && isPrepareBuildComplete )
{
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-msn/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.continuum.notification.msn"/>
-
+
</beans>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum-notifiers</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -54,42 +55,42 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>plexus-spring</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-notifier-api</artifactId>
@@ -127,8 +128,8 @@ under the License.
<!-- TODO remove hack when solution found -->
<skip>true</skip>
<argLine>-noverify</argLine>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/java/org/apache/maven/continuum/notification/wagon/WagonContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
@@ -76,11 +69,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Resource;
+
/**
* @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
* @author <a href="mailto:nramirez@exist.com">Napoleon Esmundo C. Ramirez</a>
*/
-@Service("notifier#wagon")
+@Service( "notifier#wagon" )
public class WagonContinuumNotifier
extends AbstractContinuumNotifier
implements Contextualizable
@@ -293,8 +292,8 @@ public class WagonContinuumNotifier
private MavenProject getMavenProject( Project project, BuildDefinition buildDefinition )
throws ContinuumException
{
- File projectWorkingDir =
- new File( configurationService.getWorkingDirectory(), Integer.toString( project.getId() ) );
+ File projectWorkingDir = new File( configurationService.getWorkingDirectory(), Integer.toString(
+ project.getId() ) );
File pomFile = new File( projectWorkingDir, buildDefinition.getBuildFile() );
MavenProject mavenProject;
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/main/resources/META-INF/spring-context.xml Mon Aug 13 04:29:09 2012
@@ -26,7 +26,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
- <context:annotation-config />
+ <context:annotation-config/>
<context:component-scan base-package="org.apache.maven.continuum.notification.wagon"/>
-
+
</beans>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Context.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Context.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Context.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Context.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.wagon
* under the License.
*/
-import java.util.List;
-
import org.apache.maven.wagon.authentication.AuthenticationInfo;
+import java.util.List;
+
/**
* Context
- *
+ *
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*/
public class Context
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Servlet.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Servlet.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Servlet.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/Servlet.java Mon Aug 13 04:29:09 2012
@@ -23,7 +23,7 @@ import java.util.Properties;
/**
* Servlet
- *
+ *
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*/
public class Servlet
@@ -33,7 +33,7 @@ public class Servlet
private Properties parameters;
private String path;
-
+
private String servlet;
public String getId()
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/ServletServer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/ServletServer.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/ServletServer.java (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/java/org/apache/maven/continuum/wagon/ServletServer.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.continuum.wagon
* under the License.
*/
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -40,16 +35,21 @@ import org.mortbay.jetty.servlet.Servlet
import org.mortbay.jetty.servlet.ServletHttpContext;
import org.mortbay.util.MultiException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
* Plexus Component to start a Jetty Server with servlet settings.
- *
+ *
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*/
public class ServletServer
implements Initializable, Startable
{
public static final String ROLE = ServletServer.class.getName();
-
+
private Server server;
private int port;
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/org/apache/maven/continuum/wagon/WagonContinuumNotifierTest.xml Mon Aug 13 04:29:09 2012
@@ -35,7 +35,7 @@
<parameters>
<property>
<name>rootPath</name>
- <value>${basedir}/target</value>
+ <value>${basedir}/target</value>
</property>
<property>
<name>xmlOnly</name>
@@ -48,7 +48,7 @@
</contexts>
</configuration>
</component>
-
+
<component>
<role>org.apache.maven.continuum.notification.Notifier</role>
<role-hint>wagon</role-hint>
@@ -71,16 +71,16 @@
<localRepository>~/.m2/repository</localRepository>
</configuration>
</component>
-
+
<component>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
<implementation>org.apache.maven.continuum.configuration.ConfigurationServiceMock</implementation>
</component>
-
+
<component>
<role>org.apache.maven.artifact.manager.WagonManager</role>
<implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
</component>
-
+
</components>
</plexus>
\ No newline at end of file
Modified: continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/working-directory/2/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/working-directory/2/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/working-directory/2/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/continuum-notifier-wagon/src/test/resources/working-directory/2/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>groupId</groupId>
<artifactId>artifactId</artifactId>
Modified: continuum/trunk/continuum-notifiers/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-notifiers/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-notifiers/pom.xml (original)
+++ continuum/trunk/continuum-notifiers/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<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>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>