geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r921726 - in /geronimo/server/branches/2.1: ./ framework/modules/geronimo-upgrade/src/test/data/ framework/modules/geronimo-upgrade/src/test/resources/ plugins/connector/geronimo-connector-builder/ plugins/connector/geronimo-connector-build...
Date Thu, 11 Mar 2010 08:42:47 GMT
Author: rwonly
Date: Thu Mar 11 08:42:47 2010
New Revision: 921726

URL: http://svn.apache.org/viewvc?rev=921726&view=rev
Log:
some initializing works to update to genesis 2.0 for build:
1. remove the specified version of maven-surefire-plugin in root pom and move all the files
in ".../test/data" to ".../test/resources"
2. remove the specified version of jspc-maven-plugin in root pom

Added:
    geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/resources/
      - copied from r921706, geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/data/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_0/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_0/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5_localtx/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_localtx/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/connector_1_5_notx/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/connector_1_5_notx/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/data/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/data/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/resources/ear/
      - copied from r921706, geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/ear/
Removed:
    geronimo/server/branches/2.1/framework/modules/geronimo-upgrade/src/test/data/
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/data/
Modified:
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml?rev=921726&r1=921725&r2=921726&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/pom.xml Thu
Mar 11 08:42:47 2010
@@ -124,7 +124,7 @@
                     <systemProperties>
                         <property>
                             <name>java.security.auth.login.config</name>
-                            <value>${basedir}/src/test/data/data/login.config</value>
+                            <value>${basedir}/src/test/resources/data/login.config</value>
                         </property>
                     </systemProperties>
                     

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=921726&r1=921725&r2=921726&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Thu Mar 11 08:42:47 2010
@@ -146,7 +146,7 @@ public class ConnectorModuleBuilderTest 
             ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager,
Collections.singleton(repository), null);
 
             try {
-                File planFile = new File(BASEDIR, "src/test/data/data/external-application-plan.xml");
+                File planFile = new File(BASEDIR, "src/test/resources/data/external-application-plan.xml");
                 ModuleIDBuilder idBuilder = new ModuleIDBuilder();
                 Object plan = configBuilder.getDeploymentPlan(planFile, rarFile, idBuilder);
                 context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan,
rarFile, idBuilder), plan, rarFile, Collections.singleton(configurationStore), artifactResolver,
configurationStore);

Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml?rev=921726&r1=921725&r2=921726&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
(original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/test/script/test-setup.xml
Thu Mar 11 08:42:47 2010
@@ -24,20 +24,20 @@
         <!-- Build test-rar-10 -->
         <mkdir dir="${basedir}/target/test-rar-10/META-INF"/>
         <copy todir="${basedir}/target/test-rar-10/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_0"/>
+            <fileset dir="${basedir}/src/test/resources/connector_1_0"/>
         </copy>
         <jar destfile="${basedir}/target/test-rar-10.rar" basedir="${basedir}/target/test-rar-10"/>
 
         <!-- Build test-rar-15 -->
         <mkdir dir="${basedir}/target/test-rar-15/META-INF"/>
         <copy todir="${basedir}/target/test-rar-15/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_5"/>
+            <fileset dir="${basedir}/src/test/resources/connector_1_5"/>
         </copy>
         <jar destfile="${basedir}/target/test-rar-15.rar" basedir="${basedir}/target/test-rar-15"/>
 
         <mkdir dir="${basedir}/target/test-rar-15-notx/META-INF"/>
         <copy todir="${basedir}/target/test-rar-15-notx/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_5_notx"/>
+            <fileset dir="${basedir}/src/test/resources/connector_1_5_notx"/>
         </copy>
 
         <jar destfile="${basedir}/target/test-rar-15-notx.rar"
@@ -46,7 +46,7 @@
         <mkdir dir="${basedir}/target/test-rar-15-localtx/META-INF"/>
 
         <copy todir="${basedir}/target/test-rar-15-localtx/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_5_localtx"/>
+            <fileset dir="${basedir}/src/test/resources/connector_1_5_localtx"/>
         </copy>
 
         <jar destfile="${basedir}/target/test-rar-15-localtx.rar"
@@ -58,14 +58,14 @@
                 <include name="test-rar-10.rar"/>
                 <include name="test-rar-15.rar"/>
             </fileset>
-            <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF"/>
+            <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF"/>
         </jar>
         
         <!--do it again without geronimo dds-->
         <!-- Build test-rar-10 -->
         <mkdir dir="${basedir}/target/test-rar-10-noger/META-INF"/>
         <copy todir="${basedir}/target/test-rar-10-noger/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_0">
+            <fileset dir="${basedir}/src/test/resources/connector_1_0">
                 <exclude name="geronimo-ra.xml"/>
             </fileset>
         </copy>
@@ -74,7 +74,7 @@
         <!-- Build test-rar-15 -->
         <mkdir dir="${basedir}/target/test-rar-15-noger/META-INF"/>
         <copy todir="${basedir}/target/test-rar-15-noger/META-INF">
-            <fileset dir="${basedir}/src/test/data/connector_1_5">
+            <fileset dir="${basedir}/src/test/resources/connector_1_5">
                 <exclude name="geronimo-ra.xml"/>
             </fileset>
         </copy>
@@ -86,7 +86,7 @@
                 <include name="test-rar-10-noger.rar"/>
                 <include name="test-rar-15-noger.rar"/>
             </fileset>
-            <zipfileset dir="${basedir}/src/test/data/ear" prefix="META-INF">
+            <zipfileset dir="${basedir}/src/test/resources/ear" prefix="META-INF">
                 <exclude name="geronimo-application.xml"/>
             </zipfileset>
         </jar>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=921726&r1=921725&r2=921726&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Mar 11 08:42:47 2010
@@ -21,12 +21,18 @@
 <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.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
         <version>1.3.1</version>
     </parent>
+    -->
+    <parent>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
+    </parent> 
 
     <groupId>org.apache.geronimo</groupId>
     <artifactId>geronimo</artifactId>
@@ -2199,7 +2205,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
                     <artifactId>jspc-maven-plugin</artifactId>
-                    <version>2.0-alpha-2</version>
+                    <!--<version>2.0-alpha-2</version>-->
                     <executions>
                         <execution>
                             <goals>
@@ -2218,7 +2224,7 @@
                         <dependency>
                             <groupId>org.codehaus.mojo.jspc</groupId>
                             <artifactId>jspc-compiler-tomcat6</artifactId>
-                            <version>2.0-alpha-1</version>
+                            <version>2.0-alpha-2</version>
                             <exclusions>
                                 <exclusion>
                                     <groupId>org.apache.tomcat</groupId>
@@ -2322,9 +2328,10 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
+                    <!--version>2.3</version-->
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <failIfNoTests>false</failIfNoTests>
                     </configuration>
                 </plugin>
 



Mime
View raw message