geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r436726 [4/4] - in /geronimo/server/trunk: ./ applications/console/ applications/console/console-core/ applications/console/console-core/src/java/ applications/console/console-core/src/main/ applications/console/console-core/src/main/java/ ...
Date Fri, 25 Aug 2006 09:02:57 GMT
Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
(original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
Fri Aug 25 02:02:39 2006
@@ -27,7 +27,8 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -55,8 +56,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class ConfigurationEntryTest extends TestCase {
-    private File basedir = new File(System.getProperty("basedir"));
+public class ConfigurationEntryTest extends TestSupport {
     
     protected Kernel kernel;
     protected AbstractName serverInfo;
@@ -70,12 +70,13 @@
     protected AbstractName serverStub;
 
     public void test() throws Exception {
-        File log = new File(basedir, "target/login-audit.log");
-        if (log.exists()) {
-            log.delete();
+        File auditlog = new File(BASEDIR, "target/login-audit.log");
+        
+        if (auditlog.exists()) {
+            auditlog.delete();
         }
         
-        assertEquals("Audit file wasn't cleared", 0, log.length());
+        assertEquals("Audit file wasn't cleared", 0, auditlog.length());
 
         // First try with explicit configuration entry
         LoginContext context = new LoginContext("properties-client", new AbstractTest.UsernamePasswordCallback("alan",
"starcraft"));
@@ -130,7 +131,7 @@
 
         assertTrue("id of subject should be null", ContextManager.getSubjectId(subject) ==
null);
 
-        assertTrue("Audit file wasn't written to", log.length() > 0);
+        assertTrue("Audit file wasn't written to", auditlog.length() > 0);
     }
 
     protected void setUp() throws Exception {
@@ -174,8 +175,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", new Boolean(true));
         Properties props = new Properties();
-        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(BASEDIR, "src/test/data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(BASEDIR, "src/test/data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
(original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
Fri Aug 25 02:02:39 2006
@@ -37,8 +37,6 @@
  * @version $Rev$ $Date$
  */
 public class LoginPropertiesFileTest extends AbstractTest {
-    private File basedir = new File(System.getProperty("basedir"));
-    
     protected AbstractName clientLM;
     protected AbstractName clientCE;
     protected AbstractName testCE;
@@ -75,8 +73,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", Boolean.TRUE);
         props = new Properties();
-        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(BASEDIR, "src/test/data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(BASEDIR, "src/test/data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "TestProperties");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
(original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/jaas/TimeoutTest.java
Fri Aug 25 02:02:39 2006
@@ -37,7 +37,6 @@
  * @version $Rev$ $Date$
  */
 public class TimeoutTest extends AbstractTest {
-    private File basedir = new File(System.getProperty("basedir"));
     
     protected AbstractName testCE;
     protected AbstractName testRealm;
@@ -59,8 +58,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", Boolean.TRUE);
         Properties props = new Properties();
-        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(BASEDIR, "src/test/data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(BASEDIR, "src/test/data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         gbean.setAttribute("wrapPrincipals", Boolean.TRUE);

Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
(original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
Fri Aug 25 02:02:39 2006
@@ -61,8 +61,6 @@
     
     final static private Log log = LogFactory.getLog(SubjectCarryingProtocolTest.class);
     
-    private File basedir = new File(System.getProperty("basedir"));
-    
     protected AbstractName testCE;
     protected AbstractName testRealm;
 
@@ -121,8 +119,8 @@
         gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
         gbean.setAttribute("serverSide", new Boolean(true));
         Properties props = new Properties();
-        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(BASEDIR, "src/test/data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(BASEDIR, "src/test/data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         gbean.setAttribute("loginDomainName", "PropertiesDomain");
         kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());

Modified: geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
(original)
+++ geronimo/server/trunk/modules/security/src/test/java/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
Fri Aug 25 02:02:39 2006
@@ -33,7 +33,7 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.LoginContext;
 
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
 
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -60,7 +60,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class RemoteLoginTest extends TestCase {
+public class RemoteLoginTest extends TestSupport {
     private File basedir = new File(System.getProperty("basedir"));
     
     Kernel kernel;
@@ -121,8 +121,8 @@
         gbean.setAttribute("serverSide", Boolean.TRUE);
         gbean.setAttribute("loginDomainName", "secret");
         Properties props = new Properties();
-        props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
-        props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
+        props.put("usersURI", new File(BASEDIR, "src/test/data/data/users.properties").toURI().toString());
+        props.put("groupsURI", new File(BASEDIR, "src/test/data/data/groups.properties").toURI().toString());
         gbean.setAttribute("options", props);
         kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
 

Modified: geronimo/server/trunk/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/service-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/service-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/service-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -70,7 +70,13 @@
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-testsupport</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- Thirdparty Dependencies -->
         

Modified: geronimo/server/trunk/modules/service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
(original)
+++ geronimo/server/trunk/modules/service-builder/src/main/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
Fri Aug 25 02:02:39 2006
@@ -50,7 +50,7 @@
 import org.apache.xmlbeans.QNameSet;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class GBeanBuilder implements NamespaceDrivenBuilder {
     protected Map attrRefMap;

Modified: geronimo/server/trunk/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/system/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/system/pom.xml (original)
+++ geronimo/server/trunk/modules/system/pom.xml Fri Aug 25 02:02:39 2006
@@ -95,19 +95,6 @@
     </dependencies>
     
     <build>
-        
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/schema</directory>
-                <targetPath>META-INF/schema</targetPath>
-            </resource>
-            
-            <!-- Include the dynamically generated resources (see below) -->
-            <resource>
-                <directory>${pom.basedir}/target/resources</directory>
-            </resource>
-        </resources>
-        
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -124,10 +111,10 @@
                                     <format property="build.year" pattern="yyyy"/>
                                 </tstamp>
                                 
-                                <mkdir dir="${pom.basedir}/target/resources/org/apache/geronimo/system/serverinfo"/>
+                                <mkdir dir="${pom.basedir}/target/classes/org/apache/geronimo/system/serverinfo"/>
                                 
                                 <propertyfile
-                                    file="${pom.basedir}/target/resources/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
+                                    file="${pom.basedir}/target/classes/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
                                     comment="Geronimo version information (generated, do
not modify)">
                                     
                                     <entry key="version" value="${pom.version}"/>
@@ -149,13 +136,15 @@
                             <tasks>
                                 <delete dir="${project.build.directory}/tmp"/>
                                 <mkdir dir="${project.build.directory}/tmp"/>
+                                
                                 <mkdir dir="${project.build.directory}/m1"/>
-                                <mkdir dir="${project.build.directory}/m2"/>
                                 <copy todir="${project.build.directory}/m1">
-                                    <fileset dir="${basedir}/src/test-repo/m1"/>
+                                    <fileset dir="${basedir}/src/test/repo/m1"/>
                                 </copy>
+                                
+                                <mkdir dir="${project.build.directory}/m2"/>
                                 <copy todir="${project.build.directory}/m2">
-                                    <fileset dir="${basedir}/src/test-repo/m2"/>
+                                    <fileset dir="${basedir}/src/test/repo/m2"/>
                                 </copy>
                             </tasks>
                         </configuration>

Modified: geronimo/server/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/tomcat-builder/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/tomcat-builder/pom.xml Fri Aug 25 02:02:39 2006
@@ -129,6 +129,7 @@
             <!--<artifactId>geronimo-servlet_2.4_spec</artifactId>-->
             <!--<scope>test</scope>-->
         <!--</dependency>-->
+        
         <!--WFT??? why is this needed for tests all of a sudden? -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -142,20 +143,16 @@
             <scope>test</scope>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-testsupport</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     
     <build>
-        <resources>
-            <!--<resource>-->
-                <!--<directory>src/schema</directory>-->
-                <!--<targetPath>META-INF</targetPath>-->
-                <!--<includes>-->
-                    <!--<include>geronimo-tomcat-1.1.xsd</include>-->
-                    <!--<include>geronimo-tomcat-config-1.0.xsd</include>-->
-                <!--</includes>-->
-            <!--</resource>-->
-        </resources>
-
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -167,7 +164,7 @@
                         </property>
                         <property>
                             <name>java.security.auth.login.config</name>
-                            <value>src/test-resources/data/login.config</value>
+                            <value>src/test/resources/data/login.config</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -215,14 +212,18 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="${project.build.directory}/var/catalina/conf"
file="src/var/web.xml"/>
+                                <copy todir="${project.build.directory}/var/catalina/conf"
file="src/test/data/web.xml"/>
                                 <copy todir="${project.build.directory}/var/catalina/webapps">
-                                    <fileset dir="src/test-resources/deployables">
+                                    <fileset dir="src/test/resources/deployables">
                                         <include name="war1/**"/>
                                         <include name="war3/**"/>
                                         <include name="war4/**"/>
                                     </fileset>
                                 </copy>
+                                
+                                <!--
+                                FIXME: Use dependency plugin.
+                                -->
                                 <copy todir="${project.build.directory}/endorsed" flatten="true">
                                     <fileset dir="${settings.localRepository}">
                                         <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>

Modified: geronimo/server/trunk/modules/tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/server/trunk/modules/tomcat-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Fri Aug 25 02:02:39 2006
@@ -35,7 +35,8 @@
 import javax.naming.Reference;
 import javax.xml.namespace.QName;
 
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
@@ -96,7 +97,7 @@
 /**
  * @version $Rev:385232 $ $Date$
  */
-public class TomcatModuleBuilderTest extends TestCase {
+public class TomcatModuleBuilderTest extends TestSupport {
     private static Naming naming = new Jsr77Naming();
     private Artifact baseId = new Artifact("test", "base", "1", "car");
     private final AbstractName serverName = naming.createRootName(baseId, "Server", "J2EEServer");
@@ -106,13 +107,11 @@
     private AbstractName ctcName;
     private ClassLoader cl;
     private TomcatModuleBuilder builder;
-    private File basedir = new File(System.getProperty("basedir", "."));
     private Artifact webModuleArtifact = new Artifact("foo", "bar", "1", "car");
     private Environment defaultEnvironment = new Environment();
     private ConfigurationManager configurationManager;
     private ConfigurationStore configStore;
 
-
     public void testDeployWar4() throws Exception {
         verifyStartable("war4");
     }
@@ -133,7 +132,7 @@
         WebModuleInfo info = deployWar(warName);
         assertEquals(State.RUNNING_INDEX, kernel.getGBeanState(info.moduleName));
         Set names = info.configuration.findGBeans(new AbstractNameQuery(info.moduleName.getArtifact(),
Collections.EMPTY_MAP));
-        System.out.println("names: " + names);
+        log.debug("names: " + names);
         for (Iterator iterator = names.iterator(); iterator.hasNext();) {
             AbstractName objectName = (AbstractName) iterator.next();
             assertEquals(State.RUNNING_INDEX, kernel.getGBeanState(objectName));
@@ -142,11 +141,11 @@
     }
 
     private WebModuleInfo deployWar(String warName) throws Exception {
-        File outputPath = new File(basedir, "target/test-resources/deployables/" + warName);
+        File outputPath = new File(BASEDIR, "target/test-resources/deployables/" + warName);
         recursiveDelete(outputPath);
         outputPath.mkdirs();
-        File path = new File(basedir, "src/test-resources/deployables/" + warName);
-        File dest = new File(basedir, "target/test-resources/deployables/" + warName + "/war");
+        File path = new File(BASEDIR, "src/test/resources/deployables/" + warName);
+        File dest = new File(BASEDIR, "target/test-resources/deployables/" + warName + "/war");
         recursiveCopy(path, dest);
         UnpackedJarFile jarFile = new UnpackedJarFile(path);
         Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
@@ -351,7 +350,7 @@
         WebServiceBuilder webServiceBuilder = new UnavailableWebServiceBuilder();
 
         GBeanData containerData = bootstrap.addGBean("TomcatContainer", TomcatContainer.GBEAN_INFO);
-        containerData.setAttribute("catalinaHome", new File(basedir, "target/var/catalina").toString());
+        containerData.setAttribute("catalinaHome", new File(BASEDIR, "target/var/catalina").toString());
         containerData.setReferencePattern("EngineGBean", engine.getAbstractName());
         containerData.setReferencePattern("ServerInfo", serverInfo.getAbstractName());
         AbstractName containerName = containerData.getAbstractName();

Modified: geronimo/server/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/tomcat/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/server/trunk/modules/tomcat/pom.xml Fri Aug 25 02:02:39 2006
@@ -248,6 +248,13 @@
             <artifactId>wadi-tomcat55</artifactId>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-testsupport</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     
     <build>
@@ -278,9 +285,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml"
/>
+                                <copy todir="target/var/catalina/conf" file="src/main/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml"
/>
                                 <copy todir="target/var/catalina/webapps">
-                                    <fileset dir="src/test-resources/deployables">
+                                    <fileset dir="src/test/resources/deployables">
                                         <include name="war1/**" />
                                         <include name="war3/**" />
                                     </fileset>

Modified: geronimo/server/trunk/modules/tomcat/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/tomcat/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=436726&r1=434494&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/tomcat/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
(original)
+++ geronimo/server/trunk/modules/tomcat/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Fri Aug 25 02:02:39 2006
@@ -26,7 +26,8 @@
 
 import javax.transaction.TransactionManager;
 
-import junit.framework.TestCase;
+import org.apache.geronimo.testsupport.TestSupport;
+
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
 import org.apache.geronimo.connector.outbound.connectiontracking.GeronimoTransactionListener;
 import org.apache.geronimo.security.SecurityServiceImpl;
@@ -49,8 +50,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractWebModuleTest extends TestCase {
-    private File basedir = new File(System.getProperty("basedir"));
+public abstract class AbstractWebModuleTest extends TestSupport {
     
     protected ClassLoader cl;
     protected final static String securityRealmName = "demo-properties-realm";
@@ -98,8 +98,8 @@
         ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap,
roleDesignates, cl, roleMapper);
         jacc.doStart();
 
-        URL configurationBaseURL = new File(basedir, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
-        return setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war3/").toURI(),
+        URL configurationBaseURL = new File(BASEDIR, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
+        return setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war3/").toURI(),
                 configurationBaseURL,
                 securityHolder,
                 realm,
@@ -114,8 +114,8 @@
         new SecurityServiceImpl(cl, serverInfo, "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory",
"org.apache.geronimo.security.jacc.GeronimoPolicy", null, null, null, null);
 
         Properties options = new Properties();
-        options.setProperty("usersURI", new File(basedir, "src/test-resources/data/users.properties").toURI().toString());
-        options.setProperty("groupsURI", new File(basedir, "src/test-resources/data/groups.properties").toURI().toString());
+        options.setProperty("usersURI", new File(BASEDIR, "src/test/resources/data/users.properties").toURI().toString());
+        options.setProperty("groupsURI", new File(BASEDIR, "src/test/resources/data/groups.properties").toURI().toString());
 
         LoginModuleGBean loginModule = new LoginModuleGBean("org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule",
null, true, true, cl);
         loginModule.setLoginDomainName(domainName);
@@ -175,7 +175,7 @@
         engine.doStart();
 
         ServerInfo serverInfo = new BasicServerInfo(".");
-        container = new TomcatContainer(cl, new File(basedir, "target/var/catalina").toString(),
engine, serverInfo, null, null);
+        container = new TomcatContainer(cl, new File(BASEDIR, "target/var/catalina").toString(),
engine, serverInfo, null, null);
         container.doStart();
 
         connector = new ConnectorGBean("HTTP", null, "localhost", 8181, container);

Modified: geronimo/server/trunk/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/upgrade/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/upgrade/pom.xml (original)
+++ geronimo/server/trunk/modules/upgrade/pom.xml Fri Aug 25 02:02:39 2006
@@ -64,6 +64,7 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/server/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/webservices/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/modules/webservices/pom.xml (original)
+++ geronimo/server/trunk/modules/webservices/pom.xml Fri Aug 25 02:02:39 2006
@@ -45,14 +45,6 @@
         <url>http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices</url>
     </scm>
     
-    <build>
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-    </build>
-    
     <dependencies>
         
         <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=436726&r1=436725&r2=436726&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Aug 25 02:02:39 2006
@@ -875,30 +875,6 @@
     </dependencyManagement>
 
     <build>
-        <!--
-
-        FIXME: Need to reorganize modules to use the standard maven module layout
-
-        -->
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
-
-        <resources>
-            <resource>
-                <directory>src/resources</directory>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>src/test-data</directory>
-            </testResource>
-
-            <testResource>
-                <directory>src/test-resources</directory>
-            </testResource>
-        </testResources>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -915,9 +891,9 @@
                     </executions>
 
                     <configuration>
-                        <schemaDirectory>${pom.basedir}/src/schema</schemaDirectory>
+                        <schemaDirectory>${pom.basedir}/src/main/schema</schemaDirectory>
                         <xmlConfigs>
-                            <xmlConfig implementation="java.io.File">${pom.basedir}/src/schema/xmlconfig.xml</xmlConfig>
+                            <xmlConfig implementation="java.io.File">${pom.basedir}/src/main/schema/xmlconfig.xml</xmlConfig>
                         </xmlConfigs>
                         <download>true</download>
                         <quiet>false</quiet>
@@ -928,13 +904,34 @@
                 NOTE: WAR & JSPC are overridden here (from project-config) to specify
non-standard paths.
                       Remove once modules have been reorganized to use the m2 standard layout.
                 -->
-
+                
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jspc-maven-plugin</artifactId>
+                    <version>1.4.4</version>
+                    <executions>
+                        <execution>
+                            <id>jspc</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                            <configuration>
+                                <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
+                                <inputWebXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                
+                <!--
+                FIXME: Should not configure war to assume jsp by default
+                -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.0.1</version>
                     <configuration>
-                        <warSourceDirectory>${pom.basedir}/src/webapp</warSourceDirectory>
+                        <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
                         <webXml>${pom.basedir}/target/jspweb.xml</webXml>
                         <archiveClasses>true</archiveClasses>
                         <archive>
@@ -954,24 +951,6 @@
                             <addMavenDescriptor>false</addMavenDescriptor>
                         </archive>
                     </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>jspc-maven-plugin</artifactId>
-                    <version>1.4.4</version>
-                    <executions>
-                        <execution>
-                            <id>jspc</id>
-                            <goals>
-                                <goal>compile</goal>
-                            </goals>
-                            <configuration>
-                                <warSourceDirectory>${pom.basedir}/src/webapp</warSourceDirectory>
-                                <inputWebXml>${pom.basedir}/src/webapp/WEB-INF/web.xml</inputWebXml>
-                            </configuration>
-                        </execution>
-                    </executions>
                 </plugin>
             </plugins>
         </pluginManagement>



Mime
View raw message