[picocontainer-scm] [picocontainer] [3157] java/nanocontainer/trunk/booter: Added commons-cli as transitive dependency of booter.

Revision

3157

Author

mauro

Date

2006-12-27 05:39:32 -0600 (Wed, 27 Dec 2006)

Log Message

Added commons-cli as transitive dependency of booter.
Fixed deployer failing test.

Modified Paths

• java/nanocontainer/trunk/booter/pom.xml
• java/nanocontainer/trunk/deployer/pom.xml
• java/nanocontainer/trunk/deployer/src/test/org/nanocontainer/deployer/NanoContainerDeployerTestCase.java

Diff

Modified: java/nanocontainer/trunk/booter/pom.xml (3156 => 3157)

--- java/nanocontainer/trunk/booter/pom.xml	2006-12-27 10:44:45 UTC (rev 3156)
+++ java/nanocontainer/trunk/booter/pom.xml	2006-12-27 11:39:32 UTC (rev 3157)
@@ -16,12 +16,10 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>nanocontainer</artifactId>
         </dependency>
-        <!--  test scoped dependencies -->
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
             <version>1.0</version>
-            <scope>integration-test</scope>
         </dependency>
     </dependencies>
     <build>
@@ -108,7 +106,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy</id>
+                        <id>copy-lib-common</id>
                         <phase>integration-test</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
@@ -117,9 +115,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>${pom.groupId}</groupId>
-                                    <artifactId>
-                                        nanocontainer
-                                    </artifactId>
+                                    <artifactId>nanocontainer</artifactId>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>

Modified: java/nanocontainer/trunk/deployer/pom.xml (3156 => 3157)

--- java/nanocontainer/trunk/deployer/pom.xml	2006-12-27 10:44:45 UTC (rev 3156)
+++ java/nanocontainer/trunk/deployer/pom.xml	2006-12-27 11:39:32 UTC (rev 3157)
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>${pom.groupId}</groupId>
-            <artifactId>nanocontainer</artifactId>
+            <artifactId>nanocontainer-groovy</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-vfs</groupId>
@@ -23,25 +23,69 @@
         </dependency>
         <!-- Test scoped dependencies -->
         <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>nanocontainer-booter</artifactId>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
         <plugins>
             <plugin>
-                <inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- FIXME: create target/nanodist/apps-->
-                    <excludes>
-                        <exclude>
-                            org/nanocontainer/deployer/NanoContainerDeployerTestCase.java
-                        </exclude>
-                    </excludes>
-                </configuration>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!--  Create test components -->
+                                <mkdir
+                                    dir="${project.build.directory}/test-jars/" />
+                                <jar
+                                    jarfile="${project.build.directory}/test-jars/successful-deploy.jar">
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/">
+                                        <include name="foo/**" />
+                                    </fileset>
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/successful-deploy" />
+                                </jar>
+
+                                <jar
+                                    jarfile="${project.build.directory}/test-jars/badscript-deploy.jar">
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/">
+                                        <include name="foo/**" />
+                                    </fileset>
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/badscript-deploy" />
+                                </jar>
+
+                                <jar
+                                    jarfile="${project.build.directory}/test-jars/malformed-deploy.jar">
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/">
+                                        <include name="foo/**" />
+                                    </fileset>
+                                    <fileset
+                                        dir="${project.build.directory}/test-classes/malformed-deploy" />
+                                </jar>
+
+                                <copy
+                                    todir="${project.build.directory}/deployer/apps">
+                                    <fileset
+                                        dir="${project.build.directory}/test-jars">
+                                        <include name="*.jar" />
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

Modified: java/nanocontainer/trunk/deployer/src/test/org/nanocontainer/deployer/NanoContainerDeployerTestCase.java (3156 => 3157)

--- java/nanocontainer/trunk/deployer/src/test/org/nanocontainer/deployer/NanoContainerDeployerTestCase.java	2006-12-27 10:44:45 UTC (rev 3156)
+++ java/nanocontainer/trunk/deployer/src/test/org/nanocontainer/deployer/NanoContainerDeployerTestCase.java	2006-12-27 11:39:32 UTC (rev 3157)
@@ -22,7 +22,7 @@
  */
 public class NanoContainerDeployerTestCase extends TestCase {
 
-    private String jarsDir = "target/nanodist/apps";
+    private String jarsDir = "target/deployer/apps";
     private String folderPath = "src/deploytest";
 
     public void testZipWithDeploymentScriptAndClassesCanBeDeployed() throws FileSystemException, MalformedURLException, ClassNotFoundException, IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email