You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/12/08 00:40:33 UTC
svn commit: r354907 - in /geronimo/trunk: etc/ modules/tomcat/
modules/tomcat/src/java/org/apache/geronimo/tomcat/
modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/
Author: jgenender
Date: Wed Dec 7 15:40:27 2005
New Revision: 354907
URL: http://svn.apache.org/viewcvs?rev=354907&view=rev
Log:
Set WADI version and fix some GBean issues
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/tomcat/project.xml
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ManagerGBean.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=354907&r1=354906&r2=354907&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Wed Dec 7 15:40:27 2005
@@ -171,7 +171,8 @@
tomcat_ajp_version=5.5.12
tomcat_version=5.5.12
tomcat_examples_version=5.5.12-1
-wadi_version=2.0-SNAPSHOT
+wadi_version=2.0M1
+wadi_spring_version=1.2.5
velocity_version=1.4
wsdl4j_version=1.5.2
xerces_version=2.6.2
Modified: geronimo/trunk/modules/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?rev=354907&r1=354906&r2=354907&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/project.xml (original)
+++ geronimo/trunk/modules/tomcat/project.xml Wed Dec 7 15:40:27 2005
@@ -181,6 +181,15 @@
</properties>
</dependency>
<dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${wadi_spring_version}</version>
+ <url>http://www.springframework.org/</url>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>tomcat</groupId>
<artifactId>catalina</artifactId>
<version>${tomcat_version}</version>
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ManagerGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ManagerGBean.java?rev=354907&r1=354906&r2=354907&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ManagerGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/ManagerGBean.java Wed Dec 7 15:40:27 2005
@@ -31,18 +31,19 @@
public static final String J2EE_TYPE = "Manager";
- private final Manager manager;
+ protected final Manager manager;
+ protected ManagerGBean(String className) throws Exception{
+ super();
+ manager = (Manager)Class.forName(className).newInstance();
+ }
+
public ManagerGBean(String className,
Map initParams) throws Exception {
super(); // TODO: make it an attribute
//Validate
if (className == null){
className = "org.apache.catalina.core.StandardHost";
- }
-
- if (initParams == null){
- throw new IllegalArgumentException("Must have a 'name' value in initParams.");
}
//Create the Manager object
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=354907&r1=354906&r2=354907&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Wed Dec 7 15:40:27 2005
@@ -47,6 +47,7 @@
import org.apache.geronimo.management.geronimo.WebModule;
import org.apache.geronimo.security.jacc.RoleDesignateSource;
import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
+import org.apache.geronimo.tomcat.cluster.WADIGBean;
import org.apache.geronimo.tomcat.util.SecurityHolder;
import org.apache.geronimo.transaction.TrackedConnectionAssociator;
import org.apache.geronimo.transaction.context.OnlineUserTransaction;
@@ -132,7 +133,7 @@
ObjectRetriever tomcatRealm,
ValveGBean tomcatValveChain,
CatalinaClusterGBean cluster,
- ManagerGBean manager,
+ WADIGBean manager,
boolean crossContext,
Map webServices,
J2EEServer server,
@@ -204,7 +205,7 @@
else
catalinaCluster = null;
- //Add the manaer
+ //Add the manager
if (manager != null)
this.manager = (Manager)manager.getInternalObject();
else
@@ -457,7 +458,7 @@
infoBuilder.addReference("TomcatRealm", ObjectRetriever.class);
infoBuilder.addReference("TomcatValveChain", ValveGBean.class);
infoBuilder.addReference("Cluster", CatalinaClusterGBean.class);
- infoBuilder.addReference("Manager", ManagerGBean.class);
+ infoBuilder.addReference("Manager", WADIGBean.class);
infoBuilder.addAttribute("crossContext", boolean.class, true);
infoBuilder.addAttribute("webServices", Map.class, true);
infoBuilder.addReference("J2EEServer", J2EEServer.class);
Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java?rev=354907&r1=354906&r2=354907&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/cluster/WADIGBean.java Wed Dec 7 15:40:27 2005
@@ -20,24 +20,25 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.tomcat.ManagerGBean;
+import org.apache.geronimo.tomcat.ObjectRetriever;
+import org.codehaus.wadi.tomcat55.TomcatManager;
-public class WADIGBean extends ManagerGBean {
+public class WADIGBean extends ManagerGBean implements GBeanLifecycle, ObjectRetriever{
public WADIGBean() throws Exception{
- super("org.codehaus.wadi.tomcat55.TomcatManager", null);
+
+ //super("org.codehaus.wadi.tomcat55.TomcatManager", null);
+ super("org.codehaus.wadi.tomcat55.TomcatManager");
}
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("TomcatManager", WADIGBean.class, J2EE_TYPE);
- infoFactory.addAttribute("className", String.class, true);
- infoFactory.addAttribute("initParams", Map.class, true);
- infoFactory.addOperation("getInternalObject");
- infoFactory.setConstructor(new String[] {
- "className",
- "initParams"});
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("TomcatManager", WADIGBean.class, ManagerGBean.GBEAN_INFO);
+ //infoFactory.addOperation("getInternalObject");
+ infoFactory.setConstructor(new String[0]);
GBEAN_INFO = infoFactory.getBeanInfo();
}