continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r370579 - in /maven/continuum/trunk: continuum-core-it/pom.xml continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java continuum-webapp/ continuum-webapp/pom.xml pom.xml
Date Thu, 19 Jan 2006 19:40:19 GMT
Author: evenisse
Date: Thu Jan 19 11:40:13 2006
New Revision: 370579

URL: http://svn.apache.org/viewcvs?rev=370579&view=rev
Log:
Don't use continuum-plexus-application and continuum-web for continuum-core-it.

Modified:
    maven/continuum/trunk/continuum-core-it/pom.xml
    maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
    maven/continuum/trunk/continuum-webapp/   (props changed)
    maven/continuum/trunk/continuum-webapp/pom.xml
    maven/continuum/trunk/pom.xml

Modified: maven/continuum/trunk/continuum-core-it/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/pom.xml?rev=370579&r1=370578&r2=370579&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/pom.xml (original)
+++ maven/continuum/trunk/continuum-core-it/pom.xml Thu Jan 19 11:40:13 2006
@@ -37,7 +37,9 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-plexus-application</artifactId>
+      <artifactId>continuum-webapp</artifactId>
+      <type>pom</type>
+      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

Modified: maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=370579&r1=370578&r2=370579&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
(original)
+++ maven/continuum/trunk/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
Thu Jan 19 11:40:13 2006
@@ -34,7 +34,6 @@
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.InterpolationFilterReader;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -42,7 +41,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -55,7 +53,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -95,15 +92,25 @@
     protected InputStream getConfiguration()
         throws Exception
     {
-        Reader reader = new FileReader( getTestFile( "../continuum-plexus-application/src/conf/application.xml"
) );
+        Reader webappPlexusReader =
+            new FileReader( getTestFile( "../continuum-webapp/src/main/webapp/WEB-INF/plexus.xml"
) );
 
-        Properties properties = new Properties();
+        Reader webappComponentsReader =
+            new FileReader( getTestFile( "../continuum-webapp/src/main/resources/META-INF/plexus/components.xml"
) );
 
-        properties.load( new FileInputStream( getTestFile( "../continuum-plexus-application/test.properties"
) ) );
+        String webappPlexus = IOUtil.toString( webappPlexusReader );
 
-        String s = IOUtil.toString( new InterpolationFilterReader( reader, properties, "@",
"@" ) );
+        String webappComponent = IOUtil.toString( webappComponentsReader );
 
-        return new ByteArrayInputStream( s.getBytes() );
+        webappComponent =
+            webappComponent.substring( webappComponent.indexOf( "<components>" ) +
"<components>".length() );
+
+        webappComponent = webappComponent.substring( 0, webappComponent.indexOf( "</components>"
) );
+
+        webappPlexus = webappPlexus.substring( 0, webappPlexus.indexOf( "</components>"
) ) + webappComponent +
+            webappPlexus.substring( webappPlexus.indexOf( "</components>" ) );
+
+        return new ByteArrayInputStream( webappPlexus.getBytes() );
     }
 
     protected void customizeContext( Context context )
@@ -481,6 +488,11 @@
         {
             fail( "project.scmResult == null" );
         }
+
+        progress( "Command line=" + project.getCheckoutResult().getCommandLine() );
+        progress( "Provider message=" + project.getCheckoutResult().getProviderMessage()
);
+        progress( "Command output=" + project.getCheckoutResult().getCommandOutput() );
+        progress( "exception=" + project.getCheckoutResult().getException() );
 
         assertTrue( message + "scmResult.success != true", project.getCheckoutResult().isSuccess()
);
         assertEquals( message + "Checkout error exception != null", null, project.getCheckoutResult().getException()
);

Propchange: maven/continuum/trunk/continuum-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jan 19 11:40:13 2006
@@ -2,3 +2,4 @@
 .classpath
 .project
 .wtpmodules
+continuum-webapp.iml

Modified: maven/continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/pom.xml?rev=370579&r1=370578&r2=370579&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/pom.xml (original)
+++ maven/continuum/trunk/continuum-webapp/pom.xml Thu Jan 19 11:40:13 2006
@@ -94,5 +94,25 @@
       <artifactId>jstl</artifactId>
       <version>1.0.6</version>
     </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-clearcase</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-cvs</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-local</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-perforce</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.scm</groupId>
+        <artifactId>maven-scm-provider-starteam</artifactId>
+      </dependency>
   </dependencies>
 </project>

Modified: maven/continuum/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/pom.xml?rev=370579&r1=370578&r2=370579&view=diff
==============================================================================
--- maven/continuum/trunk/pom.xml (original)
+++ maven/continuum/trunk/pom.xml Thu Jan 19 11:40:13 2006
@@ -124,10 +124,8 @@
     <module>continuum-core</module>
     <module>continuum-model</module>
     <module>continuum-notifiers</module>
-    <module>continuum-plexus-application</module>
     <module>continuum-store</module>
     <module>continuum-test</module>
-    <module>continuum-web</module>
     <module>continuum-webapp</module>
     <module>continuum-xmlrpc</module>
   </modules>



Mime
View raw message