[jboss-cvs] JBossAS SVN: r86709 - in projects/reloaded/trunk/vdf-bootstrap: src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-04-02 18:14:53 -0400 (Thu, 02 Apr 2009)
New Revision: 86709

Modified:
   projects/reloaded/trunk/vdf-bootstrap/pom.xml
   projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java
Log:
RELOADED-5: maven is stupid

Modified: projects/reloaded/trunk/vdf-bootstrap/pom.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/pom.xml	2009-04-02 22:00:49 UTC (rev 86708)
+++ projects/reloaded/trunk/vdf-bootstrap/pom.xml	2009-04-02 22:14:53 UTC (rev 86709)
@@ -228,27 +228,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.3</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/dist</outputDirectory>
-              <resources>          
-                <resource>
-                  <directory>src/main/resources</directory>
-                </resource>
-              </resources>
-            </configuration>            
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

Modified: projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java	2009-04-02 22:00:49 UTC (rev 86708)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java	2009-04-02 22:14:53 UTC (rev 86709)
@@ -65,7 +65,7 @@
       Properties props = new Properties();
       // either target or eclipse-target test-classes
       String homeDir = findDirContainingResource("server/default/conf/jboss-service.xml");
-      String serverConfigDir = new File("target/dist/server/default/conf").getAbsolutePath();
+      String serverConfigDir = new File("src/main/resources/server/default/conf").getAbsolutePath();
       props.put(ServerConfig.HOME_DIR, homeDir);
       //props.put(ServerConfig.SERVER_BASE_DIR, findDirContainingResource("server/default/conf/jboss-service.xml") + "/server");
       props.put(ServerConfig.SERVER_CONFIG_URL, new File(serverConfigDir).toURI().toURL().toExternalForm());