You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2006/03/19 03:13:28 UTC
svn commit: r386910 - in /geronimo/trunk: ./ modules/axis-builder/
modules/jetty/ modules/jetty/src/test/org/apache/geronimo/jetty/
modules/security/ modules/spring/ modules/tomcat-builder/ modules/tomcat/
modules/tomcat/src/test/org/apache/geronimo/to...
Author: jlaskowski
Date: Sat Mar 18 18:13:26 2006
New Revision: 386910
URL: http://svn.apache.org/viewcvs?rev=386910&view=rev
Log:
All migrated to M2 modules build properly from the top-level directory
jlaskowski@JLASKOWSKI /cygdrive/c/oss/geronimo
$ mvn -o clean install
...
[INFO] ----------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] ----------------------------------------------------------------------------
[INFO] Geronimo ............................................... SUCCESS [2.744s]
...
[INFO] ----------------------------------------------------------------------------
[INFO] ----------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO] ----------------------------------------------------------------------------
[INFO] Total time: 8 minutes 2 seconds
[INFO] Finished at: Sun Mar 19 02:39:35 CET 2006
[INFO] Final Memory: 24M/54M
[INFO] ----------------------------------------------------------------------------
NOTE: I had to change systemProperties to use the syntax:
<property>
<name>
<value>
whereas previously it was
<propertyName>propertyValue
I couldn't figure out why it changed, though.
Modified:
geronimo/trunk/modules/axis-builder/pom.xml
geronimo/trunk/modules/jetty/pom.xml
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
geronimo/trunk/modules/security/pom.xml
geronimo/trunk/modules/spring/pom.xml
geronimo/trunk/modules/tomcat-builder/pom.xml
geronimo/trunk/modules/tomcat/pom.xml
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
geronimo/trunk/pom.xml
Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Sat Mar 18 18:13:26 2006
@@ -30,9 +30,6 @@
<version>${geronimoVersion}</version>
<name>Geronimo :: Axis :: Builder</name>
<description>Geronimo Axis Builder</description>
- <properties>
- <buildDir>${project.build.directory}</buildDir>
- </properties>
<build>
<resources>
<!-- This schema is NOT compiled to xmlobjects. Do not remove! Used by SchemaInfoBuilder -->
@@ -41,7 +38,7 @@
<includes>
<include>soap_encoding_1_1.xsd</include>
</includes>
- <targetPath>${buildDir}/classes/META-INF/schema</targetPath>
+ <targetPath>META-INF/schema</targetPath>
</resource>
</resources>
<plugins>
Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Sat Mar 18 18:13:26 2006
@@ -29,24 +29,23 @@
<name>Geronimo :: Jetty</name>
<version>${geronimoVersion}</version>
<description>Geronimo Jetty Integration</description>
-
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <user.dir>${basedir}</user.dir>
- <java.security.auth.login.config>src/test-data/data/login.config</java.security.auth.login.config>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>${basedir}/src/test-resources/data/login.config</value>
+ </property>
</systemProperties>
<forkMode>once</forkMode>
- <workingDirectory>${basedir}</workingDirectory>
- <argLine>-enableassertions</argLine>
+ <argLine>-ea</argLine>
</configuration>
</plugin>
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo</groupId>
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java Sat Mar 18 18:13:26 2006
@@ -19,6 +19,7 @@
import java.io.File;
import java.net.URI;
+import java.net.URL;
import java.security.PermissionCollection;
import java.util.Collections;
import java.util.HashMap;
@@ -56,39 +57,79 @@
import org.apache.geronimo.transaction.context.TransactionContextManagerGBean;
import org.apache.geronimo.transaction.manager.TransactionManagerImplGBean;
-
/**
* @version $Rev$ $Date$
*/
public class AbstractWebModuleTest extends TestCase {
protected Kernel kernel;
+
private GBeanData container;
+
private ObjectName containerName;
+
private ObjectName connectorName;
+
private GBeanData connector;
+
private ObjectName webModuleName;
+
private ObjectName tmName;
+
private ObjectName ctcName;
+
private GBeanData tm;
+
private GBeanData ctc;
+
private ObjectName tcmName;
+
private GBeanData tcm;
+
private ClassLoader cl;
- private J2eeContext moduleContext = new J2eeContextImpl("jetty.test", "test", "null", NameFactory.WEB_MODULE, "jettyTest", null, null);
+
+ private J2eeContext moduleContext = new J2eeContextImpl("jetty.test", "test", "null", NameFactory.WEB_MODULE,
+ "jettyTest", null, null);
+
private GBeanData loginConfigurationGBean;
+
protected ObjectName loginConfigurationName;
+
private GBeanData securityServiceGBean;
+
protected ObjectName securityServiceName;
+
private ObjectName loginServiceName;
+
private GBeanData loginServiceGBean;
+
protected GBeanData propertiesLMGBean;
+
protected ObjectName propertiesLMName;
+
protected ObjectName propertiesRealmName;
+
private GBeanData propertiesRealmGBean;
+
private ObjectName serverInfoName;
+
private GBeanData serverInfoGBean;
+
protected final static String securityRealmName = "demo-properties-realm";
- private String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
+
+ private String basedir;
+
+ private String filebasedir;
+
+ public AbstractWebModuleTest() {
+ basedir = System.getProperty("basedir", System.getProperty("user.dir"));
+ if (basedir.length() > 0 && !basedir.endsWith("/")) {
+ basedir += "/";
+ try {
+ filebasedir = new URL("file:/" + basedir).toString();
+ } catch (Exception ignored) {
+ }
+ }
+ }
public void testDummy() throws Exception {
}
@@ -107,7 +148,9 @@
staticContentServletGBeanData.setAttribute("initParams", staticContentServletInitParams);
staticContentServletGBeanData.setAttribute("loadOnStartup", new Integer(0));
staticContentServletGBeanData.setAttribute("servletMappings", Collections.singleton("/"));
- ObjectName staticContentServletObjectName = NameFactory.getComponentName(null, null, null, NameFactory.WEB_MODULE, null, (String) staticContentServletGBeanData.getAttribute("servletName"), NameFactory.SERVLET, moduleContext);
+ ObjectName staticContentServletObjectName = NameFactory.getComponentName(null, null, null,
+ NameFactory.WEB_MODULE, null, (String) staticContentServletGBeanData.getAttribute("servletName"),
+ NameFactory.SERVLET, moduleContext);
staticContentServletGBeanData.setName(staticContentServletObjectName);
staticContentServletGBeanData.setReferencePattern("JettyServletRegistration", webModuleName);
@@ -120,10 +163,10 @@
app.setAttribute("componentContext", Collections.EMPTY_MAP);
OnlineUserTransaction userTransaction = new OnlineUserTransaction();
app.setAttribute("userTransaction", userTransaction);
- //we have no classes or libs.
- app.setAttribute("webClassPath", new URI[]{});
+ // we have no classes or libs.
+ app.setAttribute("webClassPath", new URI[] {});
app.setAttribute("contextPriorityClassLoader", Boolean.FALSE);
- app.setAttribute("configurationBaseUrl", new File("src/test-resources/deployables/").toURL());
+ app.setAttribute("configurationBaseUrl", new File(basedir + "src/test-resources/deployables/").toURL());
app.setReferencePattern("TransactionContextManager", tcmName);
app.setReferencePattern("TrackedConnectionAssociator", ctcName);
app.setReferencePattern("JettyContainer", containerName);
@@ -133,13 +176,17 @@
start(app);
}
- protected void setUpSecureAppContext(Map roleDesignates, Map principalRoleMap, ComponentPermissions componentPermissions, DefaultPrincipal defaultPrincipal, PermissionCollection checked, Set securityRoles) throws Exception {
- ObjectName mapperName = NameFactory.getComponentName(null, null, null, null, "mapper", NameFactory.JACC_MANAGER, moduleContext);
+ protected void setUpSecureAppContext(Map roleDesignates, Map principalRoleMap,
+ ComponentPermissions componentPermissions, DefaultPrincipal defaultPrincipal, PermissionCollection checked,
+ Set securityRoles) throws Exception {
+ ObjectName mapperName = NameFactory.getComponentName(null, null, null, null, "mapper",
+ NameFactory.JACC_MANAGER, moduleContext);
GBeanData mapperData = new GBeanData(mapperName, ApplicationPrincipalRoleConfigurationManager.GBEAN_INFO);
mapperData.setAttribute("principalRoleMap", principalRoleMap);
start(mapperData);
- ObjectName jaccBeanName = NameFactory.getComponentName(null, null, null, null, "foo", NameFactory.JACC_MANAGER, moduleContext);
+ ObjectName jaccBeanName = NameFactory.getComponentName(null, null, null, null, "foo", NameFactory.JACC_MANAGER,
+ moduleContext);
GBeanData jaccBeanData = new GBeanData(jaccBeanName, ApplicationPolicyConfigurationManager.GBEAN_INFO);
Map contextIDToPermissionsMap = new HashMap();
contextIDToPermissionsMap.put("TEST", componentPermissions);
@@ -166,10 +213,10 @@
OnlineUserTransaction userTransaction = new OnlineUserTransaction();
app.setAttribute("userTransaction", userTransaction);
- //we have no classes or libs.
- app.setAttribute("webClassPath", new URI[]{});
+ // we have no classes or libs.
+ app.setAttribute("webClassPath", new URI[] {});
app.setAttribute("contextPriorityClassLoader", Boolean.FALSE);
- app.setAttribute("configurationBaseUrl", new File("src/test-resources/deployables/").toURL());
+ app.setAttribute("configurationBaseUrl", new File(basedir + "src/test-resources/deployables/").toURL());
app.setReferencePattern("TransactionContextManager", tcmName);
app.setReferencePattern("TrackedConnectionAssociator", ctcName);
app.setReferencePattern("JettyContainer", containerName);
@@ -194,26 +241,29 @@
securityServiceName = new ObjectName("geronimo.server:j2eeType=SecurityService");
securityServiceGBean = new GBeanData(securityServiceName, SecurityServiceImpl.GBEAN_INFO);
securityServiceGBean.setReferencePattern("ServerInfo", serverInfoName);
- securityServiceGBean.setAttribute("policyConfigurationFactory", "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory");
+ securityServiceGBean.setAttribute("policyConfigurationFactory",
+ "org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory");
securityServiceGBean.setAttribute("policyProvider", "org.apache.geronimo.security.jacc.GeronimoPolicy");
loginServiceName = new ObjectName("test:name=TestLoginService");
loginServiceGBean = new GBeanData(loginServiceName, JaasLoginService.GBEAN_INFO);
loginServiceGBean.setReferencePattern("Realms", new ObjectName("geronimo.server:j2eeType=SecurityRealm,*"));
-// loginServiceGBean.setAttribute("reclaimPeriod", new Long(1000 * 1000));
+ // loginServiceGBean.setAttribute("reclaimPeriod", new Long(1000 *
+ // 1000));
loginServiceGBean.setAttribute("algorithm", "HmacSHA1");
loginServiceGBean.setAttribute("password", "secret");
propertiesLMName = new ObjectName("geronimo.security:type=LoginModule,name=demo-properties-login");
propertiesLMGBean = new GBeanData(propertiesLMName, LoginModuleGBean.GBEAN_INFO);
- propertiesLMGBean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
+ propertiesLMGBean.setAttribute("loginModuleClass",
+ "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
propertiesLMGBean.setAttribute("serverSide", Boolean.TRUE);
Properties options = new Properties();
- options.setProperty("usersURI", "src/test-resources/data/users.properties");
- options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+ options.setProperty("usersURI", filebasedir + "src/test-resources/data/users.properties");
+ options.setProperty("groupsURI", filebasedir + "src/test-resources/data/groups.properties");
propertiesLMGBean.setAttribute("options", options);
propertiesLMGBean.setAttribute("wrapPrincipals", Boolean.TRUE);
- //TODO should this be called securityRealmName?
+ // TODO should this be called securityRealmName?
propertiesLMGBean.setAttribute("loginDomainName", "demo-properties-realm");
ObjectName testUseName = new ObjectName("geronimo.security:type=LoginModuleUse,name=properties");
@@ -226,9 +276,11 @@
propertiesRealmGBean.setReferencePattern("ServerInfo", serverInfoName);
propertiesRealmGBean.setAttribute("realmName", "demo-properties-realm");
propertiesRealmGBean.setReferencePattern("LoginService", loginServiceName);
-// Properties config = new Properties();
-// config.setProperty("LoginModule.1.REQUIRED", propertiesLMName.getCanonicalName());
-// propertiesRealmGBean.setAttribute("loginModuleConfiguration", config);
+ // Properties config = new Properties();
+ // config.setProperty("LoginModule.1.REQUIRED",
+ // propertiesLMName.getCanonicalName());
+ // propertiesRealmGBean.setAttribute("loginModuleConfiguration",
+ // config);
propertiesRealmGBean.setReferencePattern("LoginModuleConfiguration", testUseName);
PrincipalInfo.PrincipalEditor principalEditor = new PrincipalInfo.PrincipalEditor();
principalEditor.setAsText("metro,org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal,false");
@@ -268,12 +320,16 @@
protected void setUp() throws Exception {
cl = this.getClass().getClassLoader();
- containerName = NameFactory.getWebComponentName(null, null, null, null, "jettyContainer", "WebResource", moduleContext);
- connectorName = NameFactory.getWebComponentName(null, null, null, null, "jettyConnector", "WebResource", moduleContext);
+ containerName = NameFactory.getWebComponentName(null, null, null, null, "jettyContainer", "WebResource",
+ moduleContext);
+ connectorName = NameFactory.getWebComponentName(null, null, null, null, "jettyConnector", "WebResource",
+ moduleContext);
webModuleName = NameFactory.getModuleName(null, null, null, null, "testModule", moduleContext);
- tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager", NameFactory.TRANSACTION_MANAGER, moduleContext);
- tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager", NameFactory.TRANSACTION_CONTEXT_MANAGER, moduleContext);
+ tmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionManager",
+ NameFactory.TRANSACTION_MANAGER, moduleContext);
+ tcmName = NameFactory.getComponentName(null, null, null, null, null, "TransactionContextManager",
+ NameFactory.TRANSACTION_CONTEXT_MANAGER, moduleContext);
ctcName = new ObjectName("geronimo.test:role=ConnectionTrackingCoordinator");
kernel = KernelFactory.newInstance().createKernel("test.kernel");
Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java (original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/ClassLoaderTest.java Sat Mar 18 18:13:26 2006
@@ -35,7 +35,11 @@
URL[] urls;
public void setUp() throws MalformedURLException {
- URL url = new File("src/test-resources/deployables/cltest/").toURL();
+ String basedir = System.getProperty("basedir", "");
+ if (basedir.length() > 0) {
+ basedir += "/";
+ }
+ URL url = new File(basedir + "src/test-resources/deployables/cltest/").toURL();
// URL url = getClass().getClassLoader().getResource("deployables/cltest/");
System.err.println("URL: "+url);
urls = new URL[]{url};
Modified: geronimo/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/security/pom.xml (original)
+++ geronimo/trunk/modules/security/pom.xml Sat Mar 18 18:13:26 2006
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
-
+
Copyright 2006 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,16 +29,23 @@
<artifactId>geronimo-security</artifactId>
<version>${geronimoVersion}</version>
<name>Geronimo :: Security</name>
+ <description>Geronimo Security</description>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
- <log4j.configuration>${basedir}/log4j.properties</log4j.configuration>
+ <property>
+ <name>log4j.configuration</name>
+ <value>${basedir}/log4j.properties</value>
+ </property>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>${basedir}/src/test-data/data/login.config</value>
+ </property>
</systemProperties>
- <forkMode>pertest</forkMode>
+ <forkMode>once</forkMode>
<workingDirectory>${basedir}</workingDirectory>
</configuration>
</plugin>
@@ -48,77 +55,62 @@
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-interceptor</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${geronimoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- <version>${geronimoSpecJ2eeJaccVersion}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>${cglibVersion}</version>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>${concurrentVersion}</version>
</dependency>
<dependency>
<groupId>activeio</groupId>
<artifactId>activeio</artifactId>
- <version>${activeIoVersion}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commonsLoggingVersion}</version>
</dependency>
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
- <version>${mx4jVersion}</version>
</dependency>
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>${regexpVersion}</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldbVersion}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${log4jVersion}</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/trunk/modules/spring/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/spring/pom.xml (original)
+++ geronimo/trunk/modules/spring/pom.xml Sat Mar 18 18:13:26 2006
@@ -48,8 +48,9 @@
<artifactId>mx4j</artifactId>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
+ <version>${springVersion}</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/trunk/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/pom.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/pom.xml Sat Mar 18 18:13:26 2006
@@ -37,7 +37,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Sat Mar 18 18:13:26 2006
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
+
Copyright 2006 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,6 +29,7 @@
<artifactId>geronimo-tomcat</artifactId>
<version>${geronimoVersion}</version>
<name>Geronimo :: Tomcat</name>
+ <description>Geronimo Tomcat integration</description>
<properties>
<buildDir>${project.build.directory}</buildDir>
<endorsedDir>${buildDir}/endorsed</endorsedDir>
@@ -46,8 +47,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <java.endorsed.dirs>${endorsedDir}</java.endorsed.dirs>
- <user.dir>${basedir}</user.dir>
+ <property>
+ <name>java.endorsed.dirs</name>
+ <value>${endorsedDir}</value>
+ </property>
</systemProperties>
<forkMode>once</forkMode>
</configuration>
@@ -65,7 +68,8 @@
<tasks>
<tstamp />
<!-- add this to parent -->
- <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/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
<copy todir="target/var/catalina/webapps">
<fileset dir="src/test-resources/deployables">
<include name="war1/**" />
@@ -90,28 +94,22 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.0_spec</artifactId>
- <version>${geronimoSpecJspVersion}</version>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- <version>${geronimoSpecJ2eeJaccVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- <version>${geronimoSpecJ2eeConnectorVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${geronimoSpecJtaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- <version>${geronimoSpecJ2eeManagementVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
@@ -121,7 +119,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -130,7 +127,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo-security</artifactId>
@@ -157,17 +153,14 @@
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
@@ -188,9 +181,9 @@
<version>${tomcatVersion}</version>
</dependency>
<!--
- - Required until any realm is provided to Tomcat
- - See StandardEngine::getRealm()
- -->
+ - Required until any realm is provided to Tomcat
+ - See StandardEngine::getRealm()
+ -->
<dependency>
<groupId>tomcat</groupId>
<artifactId>catalina-optional</artifactId>
@@ -217,7 +210,6 @@
<version>${tomcatVersion}</version>
</dependency>
<dependency>
-
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
<version>${tomcatVersion}</version>
@@ -233,7 +225,6 @@
<version>${tomcatVersion}</version>
</dependency>
<dependency>
-
<groupId>tomcat</groupId>
<artifactId>servlets-default</artifactId>
<version>${tomcatVersion}</version>
@@ -253,7 +244,6 @@
<artifactId>xml-apis</artifactId>
<version>${xmlApisVersion}</version>
</dependency>
-
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/AbstractWebModuleTest.java Sat Mar 18 18:13:26 2006
@@ -18,6 +18,7 @@
import java.io.File;
import java.net.URI;
+import java.net.URL;
import java.security.PermissionCollection;
import java.security.Permissions;
import java.util.Collections;
@@ -100,15 +101,30 @@
private ObjectName serverInfoName;
private GBeanData serverInfoGBean;
+ private String basedir;
+
+ private String filebasedir;
+
+ public AbstractWebModuleTest() {
+ basedir = System.getProperty("basedir", System.getProperty("user.dir"));
+ if (basedir.length() > 0 && !basedir.endsWith("/")) {
+ basedir += "/";
+ try {
+ filebasedir = new URL("file:/" + basedir).toString();
+ } catch (Exception ignored) {
+ }
+ }
+ }
+
public void testDummy() {
}
protected void setUpInsecureAppContext() throws Exception {
GBeanData app = new GBeanData(webModuleName, TomcatWebAppContext.GBEAN_INFO);
- app.setAttribute("webAppRoot", new File("target/var/catalina/webapps/war1/").toURI());
+ app.setAttribute("webAppRoot", new File(basedir + "target/var/catalina/webapps/war1/").toURI());
app.setAttribute("webClassPath", new URI[]{});
- app.setAttribute("configurationBaseUrl", new File("target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL());
+ app.setAttribute("configurationBaseUrl", new File(basedir + "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL());
app.setAttribute("componentContext", Collections.EMPTY_MAP);
app.setReferencePattern("Container", containerName);
OnlineUserTransaction userTransaction = new OnlineUserTransaction();
@@ -150,10 +166,10 @@
securityHolder.setSecurityRealm(REALM_NAME);
GBeanData app = new GBeanData(webModuleName, TomcatWebAppContext.GBEAN_INFO);
- app.setAttribute("webAppRoot", new File("target/var/catalina/webapps/war3/").toURI());
+ app.setAttribute("webAppRoot", new File(basedir + "target/var/catalina/webapps/war3/").toURI());
app.setAttribute("webClassPath", new URI[]{});
app.setAttribute("securityHolder", securityHolder);
- app.setAttribute("configurationBaseUrl", new File("target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL());
+ app.setAttribute("configurationBaseUrl", new File(basedir + "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL());
app.setAttribute("contextPath", "/securetest");
app.setReferencePattern("TomcatRealm", contextRealmName);
app.setReferencePattern("RoleDesignateSource", jaccBeanName);
@@ -201,11 +217,11 @@
securityHolder.setSecurityRealm("Geronimo");
GBeanData app = new GBeanData(webModuleName, TomcatWebAppContext.GBEAN_INFO);
app.setAttribute("classLoader", cl);
- app.setAttribute("webAppRoot", new File("target/var/catalina/webapps/war3/").toURI());
+ app.setAttribute("webAppRoot", new File(basedir + "target/var/catalina/webapps/war3/").toURI());
app.setAttribute("webClassPath", new URI[]{});
app.setAttribute("contextPriorityClassLoader", Boolean.FALSE);
app.setAttribute("securityHolder", securityHolder);
- app.setAttribute("configurationBaseUrl", new File("target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL());
+ app.setAttribute("configurationBaseUrl", new File(basedir + "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL());
app.setAttribute("contextPath", "/securetest");
app.setReferencePattern("RoleDesignateSource", jaccBeanName);
@@ -247,8 +263,8 @@
propertiesLMGBean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
propertiesLMGBean.setAttribute("serverSide", Boolean.TRUE);
Properties options = new Properties();
- options.setProperty("usersURI", "src/test-resources/data/users.properties");
- options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+ options.setProperty("usersURI", filebasedir + "src/test-resources/data/users.properties");
+ options.setProperty("groupsURI", filebasedir + "src/test-resources/data/groups.properties");
propertiesLMGBean.setAttribute("options", options);
propertiesLMGBean.setAttribute("wrapPrincipals", Boolean.TRUE);
propertiesLMGBean.setAttribute("loginDomainName", "geronimo-properties-realm");
@@ -377,7 +393,7 @@
// Need to override the constructor for unit tests
container = new GBeanData(containerName, TomcatContainer.GBEAN_INFO);
container.setAttribute("classLoader", cl);
- container.setAttribute("catalinaHome", "target/var/catalina");
+ container.setAttribute("catalinaHome", basedir + "target/var/catalina");
container.setReferencePattern("EngineGBean", engineName);
container.setReferencePattern("ServerInfo", serverInfoName);
Modified: geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java (original)
+++ geronimo/trunk/modules/tomcat/src/test/org/apache/geronimo/tomcat/ContainerTest.java Sat Mar 18 18:13:26 2006
@@ -84,6 +84,20 @@
private ObjectName propertiesRealmName;
private GBeanData propertiesRealmGBean;
+ private String basedir;
+
+ private String filebasedir;
+
+ public ContainerTest() {
+ basedir = System.getProperty("basedir", System.getProperty("user.dir"));
+ if (basedir.length() > 0 && !basedir.endsWith("/")) {
+ basedir += "/";
+ try {
+ filebasedir = new URL("file:/" + basedir).toString();
+ } catch (Exception ignored) {
+ }
+ }
+ }
public void testWebServiceHandler() throws Exception {
@@ -204,8 +218,8 @@
propertiesLMGBean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
propertiesLMGBean.setAttribute("serverSide", Boolean.TRUE);
Properties options = new Properties();
- options.setProperty("usersURI", "src/test-resources/data/users.properties");
- options.setProperty("groupsURI", "src/test-resources/data/groups.properties");
+ options.setProperty("usersURI", filebasedir + "src/test-resources/data/users.properties");
+ options.setProperty("groupsURI", filebasedir + "src/test-resources/data/groups.properties");
propertiesLMGBean.setAttribute("options", options);
propertiesLMGBean.setAttribute("loginDomainName", "geronimo-properties-realm");
@@ -256,7 +270,7 @@
//ServerInfo
serverInfoName = new ObjectName("geronimo.system:role=ServerInfo");
serverInfoGBean = new GBeanData(serverInfoName, BasicServerInfo.GBEAN_INFO);
- serverInfoGBean.setAttribute("baseDirectory", ".");
+ serverInfoGBean.setAttribute("baseDirectory", basedir);
start(serverInfoGBean);
Map initParams = new HashMap();
@@ -286,7 +300,7 @@
container = new GBeanData(containerName, TomcatContainer.GBEAN_INFO);
container.setAttribute("classLoader", cl);
- container.setAttribute("catalinaHome", "target/var/catalina");
+ container.setAttribute("catalinaHome", basedir + "target/var/catalina");
container.setReferencePattern("EngineGBean", engineName);
container.setReferencePattern("ServerInfo", serverInfoName);
start(container);
Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=386910&r1=386909&r2=386910&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Sat Mar 18 18:13:26 2006
@@ -391,11 +391,6 @@
<version>${scoutVersion}</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${springVersion}</version>
- </dependency>
- <dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>${staxVersion}</version>
@@ -669,7 +664,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-one-plugin</artifactId>
<executions>
<execution>
@@ -692,7 +686,6 @@
</extension>
</extensions>
</build>
-
<repositories>
<repository>
<snapshots>