Author: djencks Date: Wed Dec 8 00:11:24 2004 New Revision: 111234 URL: http://svn.apache.org/viewcvs?view=rev&rev=111234 Log: merge trunk changes to 111229. change jetty version to one that will be available on openejb maven repo shortly Added: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/log4j.properties - copied unchanged from r111229, geronimo/trunk/modules/axis/log4j.properties Removed: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/JettyServiceWrapper.java Modified: geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Modified: geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/etc/version-info.ent Wed Dec 8 00:11:24 2004 @@ -67,7 +67,7 @@ <!ENTITY jaxb-ri-version "SNAPSHOT"> <!ENTITY jdbm-version "0.20-dev"> <!ENTITY jelly-velocity-tags-version "SNAPSHOT"> -<!ENTITY jetty-version "5.1.1RC1"> +<!ENTITY jetty-version "5.1.2-G-7-12-2004"> <!ENTITY jgroups-version "2.2.5"> <!ENTITY jmock-version "1.0.1"> <!ENTITY jrms-version "1.1"> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/maven.xml Wed Dec 8 00:11:24 2004 @@ -331,6 +331,9 @@ <ant:arg value="distribute"/> <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-jmxdebug-${pom.currentVersion}.war"/> </ant:java> + + <ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/> + </goal> <goal name="cli"> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/project.xml Wed Dec 8 00:11:24 2004 @@ -180,16 +180,6 @@ <repository>true</repository> </properties> </dependency> -<!-- Tomcat module still breaks a clean build - <dependency> - <groupId>geronimo</groupId> - <artifactId>geronimo-tomcat</artifactId> - <version>${pom.currentVersion}</version> - <properties> - <repository>true</repository> - </properties> - </dependency> ---> <dependency> <groupId>geronimo</groupId> <artifactId>geronimo-jetty-builder</artifactId> @@ -606,6 +596,11 @@ <client>true</client> <deploy>true</deploy> <clideployer>true</clideployer> +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - + <repository>true</repository> + --> </properties> </dependency> @@ -703,17 +698,144 @@ <repository>true</repository> </properties> </dependency> +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - + <dependency> + <groupId>geronimo</groupId> + <artifactId>geronimo-tomcat</artifactId> + <version>${pom.currentVersion}</version> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>catalina</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>catalina</artifactId> - <!-- Don't want to break the other modules that rely on the libs --> - <!--version>&tomcat-version;</version--> <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> </properties> </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>catalina-optional</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>tomcat-coyote</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>tomcat-http</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>&tomcat-version;</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>&tomcat-version;</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>tomcat-util</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>naming-resources</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>servlets-default</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>servlets-invoker</artifactId> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>&commons-beanutils-version;</version> + <url>http://jakarta.apache.org/commons/beanutils</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>&commons-digester-version;</version> + <url>http://jakarta.apache.org/commons/digester</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>commons-modeler</groupId> + <artifactId>commons-modeler</artifactId> + <version>&commons-modeler-version;</version> + <url>http://jakarta.apache.org/commons/modeler</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + --> <!-- for jsps --> <dependency> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Wed Dec 8 00:11:24 2004 @@ -83,9 +83,9 @@ <dependency> <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri> </dependency> - <!-- - - Uncomment it to run Apache Tomcat - - +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - <dependency> <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri> </dependency> @@ -98,7 +98,7 @@ <dependency> <uri>tomcat/jars/tomcat-util-5.5.4.jar</uri> </dependency> - --> + --> <dependency> <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri> </dependency> @@ -187,11 +187,11 @@ <reference name="SecurityService">geronimo.deployer:type=SecurityService</reference> <attribute name="defaultServlets">geronimo.deployer:role=DefaultServlet,config=org/apache/geronimo/J2EEDeployer,*</attribute> </gbean> - <!-- - - Uncomment it to run Apache Tomcat module builder - - +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - <gbean name="geronimo.deployer:role=ModuleBuilder,type=Web,config=org/apache/geronimo/J2EEDeployer" class="org.apache.geronimo.tomcat.deployment.TomcatModuleBuilder"/> - --> + --> <gbean name="geronimo.deployer:role=DefaultServlet,config=org/apache/geronimo/J2EEDeployer,name=StaticContent" class="org.apache.geronimo.jetty.JettyServletHolder"> <attribute name="servletName">default</attribute> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Dec 8 00:11:24 2004 @@ -71,9 +71,9 @@ <dependency> <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri> </dependency> - <!-- - - Uncomment it to run Apache Tomcat as the web container - - +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - <dependency> <uri>geronimo/jars/geronimo-tomcat-${geronimo_version}.jar</uri> </dependency> @@ -81,10 +81,7 @@ <uri>tomcat/jars/catalina-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/jasper-compiler-5.5.4.jar</uri> - </dependency> - <dependency> - <uri>tomcat/jars/jasper-runtime-5.5.4.jar</uri> + <uri>tomcat/jars/catalina-optional-5.5.4.jar</uri> </dependency> <dependency> <uri>tomcat/jars/tomcat-coyote-5.5.4.jar</uri> @@ -125,7 +122,7 @@ <dependency> <uri>mx4j/jars/mx4j-2.0.1.jar</uri> </dependency> - --> + --> <dependency> <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri> </dependency> @@ -269,11 +266,11 @@ <!-- default WAR container using Jetty --> <gbean name="geronimo.server:type=WebContainer,container=Jetty" class="org.apache.geronimo.jetty.JettyContainerImpl"/> - <!-- - - Uncomment it and comment the above Jetty GBean to run Apache Tomcat as the web container - - +<!-- the tomcat module's requirement + - uncomment it to run Apache Tomcat as a web container + - <gbean name="geronimo.server:type=WebContainer,container=Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer"/> - --> + --> <gbean name="geronimo.server:type=RequestLog,container=Jetty" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog"> <reference name="JettyContainer">geronimo.server:type=WebContainer,container=Jetty</reference> <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference> Copied: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/log4j.properties (from r111229, geronimo/trunk/modules/axis/log4j.properties) Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/log4j.properties?view=diff&rev=111234&p1=geronimo/trunk/modules/axis/log4j.properties&r1=111229&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/log4j.properties&r2=111234 ============================================================================== Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/AxisGeronimoUtils.java Wed Dec 8 00:11:24 2004 @@ -15,14 +15,11 @@ */ package org.apache.geronimo.axis; -import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; import java.lang.reflect.Method; @@ -38,6 +35,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; + import javax.ejb.EJBHome; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; @@ -51,7 +49,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.gbean.GBeanData; -import org.apache.geronimo.gbean.jmx.GBeanMBean; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.config.Configuration; import org.apache.geronimo.kernel.config.ConfigurationStore; @@ -135,16 +132,6 @@ * @param kernel * @throws DeploymentException */ - public static void startGBean(ObjectName objectName, GBeanMBean gbean, Kernel kernel) - throws DeploymentException { - try { - startedGbeans.add(objectName); - kernel.loadGBean(objectName, gbean); - kernel.startGBean(objectName); - } catch (Exception e) { - throw new DeploymentException(e); - } - } public static void startGBean(GBeanData gbean, Kernel kernel, ClassLoader classLoader) throws DeploymentException { @@ -164,11 +151,11 @@ * @param kernel * @throws DeploymentException */ - public static void startGBeanOnlyIfNotStarted(ObjectName objectName, GBeanMBean gbean, Kernel kernel) + public static void startGBeanOnlyIfNotStarted(ObjectName objectName, GBeanData gbean, Kernel kernel,ClassLoader classLoader) throws DeploymentException { try { if (!checkAlreadyStarted(objectName, kernel)) { - startGBean(objectName, gbean, kernel); + startGBean(gbean, kernel,classLoader); log.info("Started .. " + objectName); } else { log.info(objectName + " GBean already started"); @@ -362,24 +349,24 @@ } - /** - * - * @param unpackedCar - * @return - * @throws Exception - */ - public static GBeanMBean loadConfig(File unpackedCar) throws Exception { - InputStream in = new FileInputStream(new File(unpackedCar, "META-INF/config.ser")); - try { - ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(in)); - GBeanData config = new GBeanData(); - config.readExternal(ois); - return new GBeanMBean(config, Thread.currentThread().getContextClassLoader()); - } finally { - in.close(); - } - } - +// /** +// * +// * @param unpackedCar +// * @return +// * @throws Exception +// */ +// public static GBeanMBean loadConfig(File unpackedCar) throws Exception { +// InputStream in = new FileInputStream(new File(unpackedCar, "META-INF/config.ser")); +// try { +// ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(in)); +// GBeanData config = new GBeanData(); +// config.readExternal(ois); +// return new GBeanMBean(config, Thread.currentThread().getContextClassLoader()); +// } finally { +// in.close(); +// } +// } +// /** * * @param state Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/Configuration.java Wed Dec 8 00:11:24 2004 @@ -20,5 +20,5 @@ */ public interface Configuration { - public ClassLoader getClassLoader(); + public ClassLoader getConfigurationClassLoader(); } Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/EJBWSGBean.java Wed Dec 8 00:11:24 2004 @@ -16,6 +16,9 @@ package org.apache.geronimo.axis; +import java.util.Collection; +import java.util.Iterator; + import org.apache.axis.utils.ClassUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,49 +26,32 @@ import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.GBeanLifecycle; import org.apache.geronimo.gbean.WaitingException; -import org.apache.geronimo.kernel.config.Configuration; -import org.apache.geronimo.kernel.jmx.JMXUtil; -import javax.management.ObjectName; - -import java.util.Collection; -import java.util.Iterator; /** * @version $Rev: $ $Date: $ */ public class EJBWSGBean implements GBeanLifecycle { private static Log log = LogFactory.getLog(EJBWSGBean.class); - /** - * Field name - */ - private final String name; - - /** - * Field GBEAN_INFO - */ private static final GBeanInfo GBEAN_INFO; - /** - * Field objectName - */ - private final ObjectName objectName; - private Configuration ejbConfig; + //GBean Attributes + private final String objectName; + private final Configuration ejbConfig; private Collection classList; + static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("EJBWSGBean", EJBWSGBean.class); - - // attributes - infoFactory.addAttribute("Name", String.class, true); infoFactory.addAttribute("objectName", String.class, false); infoFactory.addReference("ejbConfig", Configuration.class); infoFactory.addAttribute("classList", Collection.class, true); + // operations - infoFactory.setConstructor(new String[]{"Name", - "objectName"}); + infoFactory.setConstructor(new String[]{"objectName","ejbConfig","classList"}); + GBEAN_INFO = infoFactory.getBeanInfo(); } @@ -75,9 +61,10 @@ * @param name * @param objectName */ - public EJBWSGBean(String name, String objectName) { - this.name = name; - this.objectName = JMXUtil.getObjectName(objectName); + public EJBWSGBean(String objectName,Configuration ejbConfig,Collection classList) { + this.objectName = objectName; + this.ejbConfig = ejbConfig; + this.classList = classList; } /** @@ -94,7 +81,7 @@ * @throws Exception */ public void doStart() throws WaitingException, Exception { - System.out.println(name + "has started"); + log.info(objectName + "has started"); ClassLoader cl = ejbConfig.getConfigurationClassLoader(); for (Iterator it = classList.iterator(); it.hasNext();) { String className = (String) it.next(); @@ -123,40 +110,4 @@ return GBEAN_INFO; } - /** - * Method getName - * - * @return - */ - public String getName() { - return name; - } - - /** - * @return - */ - public Collection getClassList() { - return classList; - } - - /** - * @return - */ - public Configuration getEjbConfig() { - return ejbConfig; - } - - /** - * @param collection - */ - public void setClassList(Collection collection) { - classList = collection; - } - - /** - * @param configuration - */ - public void setEjbConfig(Configuration configuration) { - ejbConfig = configuration; - } } Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/POJOWSGBean.java Wed Dec 8 00:11:24 2004 @@ -16,6 +16,11 @@ package org.apache.geronimo.axis; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.Collection; +import java.util.Iterator; + import org.apache.axis.utils.ClassUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,20 +28,18 @@ import org.apache.geronimo.gbean.GBeanInfoBuilder; import org.apache.geronimo.gbean.GBeanLifecycle; import org.apache.geronimo.gbean.WaitingException; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.Collection; -import java.util.Iterator; /** * @version $Rev: $ $Date: $ */ public class POJOWSGBean implements GBeanLifecycle { private static Log log = LogFactory.getLog(POJOWSGBean.class); - private final String objectName; + private static final GBeanInfo GBEAN_INFO; - private URL moduleURL; - private Collection classList; + + private final String objectName; + private final URL moduleURL; + private final Collection classList; static { GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("POJOWSGBean", @@ -47,13 +50,15 @@ infoFactory.addAttribute("moduleURL", URL.class, true); infoFactory.addAttribute("classList", Collection.class, true); // operations - infoFactory.setConstructor(new String[]{"objectName"}); + infoFactory.setConstructor(new String[]{"objectName","moduleURL","classList"}); GBEAN_INFO = infoFactory.getBeanInfo(); } - public POJOWSGBean(String objectName) { + public POJOWSGBean(String objectName,URL moduleURL,Collection classList) { this.objectName = objectName; + this.moduleURL = moduleURL; + this.classList = classList; } @@ -61,6 +66,7 @@ } public void doStart() throws WaitingException, Exception { + log.info("POJO WS starting"); ClassLoader cl = new URLClassLoader(new URL[]{moduleURL}); for (Iterator it = classList.iterator(); it.hasNext();) { String className = (String) it.next(); @@ -86,34 +92,5 @@ */ public static GBeanInfo getGBeanInfo() { return GBEAN_INFO; - } - - /** - * @return - */ - public URL getModuleURL() { - return moduleURL; - } - - - /** - * @param url - */ - public void setModuleURL(URL url) { - moduleURL = url; - } - - /** - * @return - */ - public Collection getClassList() { - return classList; - } - - /** - * @param collection - */ - public void setClassList(Collection collection) { - classList = collection; } } Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/java/org/apache/geronimo/axis/WSConfigBuilder.java Wed Dec 8 00:11:24 2004 @@ -91,7 +91,7 @@ GBeanData wsGbean = new GBeanData(wsplan.getWsName(), EJBWSGBean.getGBeanInfo()); ArrayList classList = AxisGeronimoUtils.getClassFileList(new ZipFile(wsplan.getModule())); wsGbean.setAttribute("classList", classList); - wsGbean.setReferencePattern("EjbConfig", wsplan.getEjbConfName()); + wsGbean.setReferencePattern("ejbConfig", wsplan.getEjbConfName()); //create a configuraton with Web Service GBean byte[] state = Configuration.storeGBeans(new GBeanData[] {wsGbean}); Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AbstractWebServiceTest.java Wed Dec 8 00:11:24 2004 @@ -26,8 +26,8 @@ import org.apache.geronimo.axis.testUtils.AxisGeronimoConstants; import org.apache.geronimo.axis.testUtils.TestingUtils; +import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.gbean.WaitingException; -import org.apache.geronimo.gbean.jmx.GBeanMBean; import org.apache.geronimo.j2ee.deployment.EARConfigBuilder; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.kernel.config.ConfigurationStore; @@ -71,13 +71,13 @@ TestingUtils.startJ2EEContinerAndAxisServlet(kernel); //Start axis gbean - GBeanMBean axisgbean = new GBeanMBean(AxisGbean.getGBeanInfo()); - kernel.loadGBean(axisname, axisgbean); + GBeanData axisgbData = new GBeanData(axisname,AxisGbean.getGBeanInfo()); + kernel.loadGBean(axisgbData, Thread.currentThread().getContextClassLoader()); kernel.startGBean(axisname); - GBeanMBean wsConfgBuilderbean = new GBeanMBean(WSConfigBuilder.getGBeanInfo()); + GBeanData wsConfgBuilderbean = new GBeanData(wsConfgBuilderName,WSConfigBuilder.getGBeanInfo()); wsConfgBuilderbean.setReferencePattern("AxisGbean",axisname); - kernel.loadGBean(wsConfgBuilderName, wsConfgBuilderbean); + kernel.loadGBean(wsConfgBuilderbean,Thread.currentThread().getContextClassLoader()); kernel.startGBean(wsConfgBuilderName); Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/AxisGBeanTest.java Wed Dec 8 00:11:24 2004 @@ -20,10 +20,11 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLClassLoader; + import javax.management.ObjectName; import org.apache.geronimo.axis.testUtils.TestingUtils; -import org.apache.geronimo.gbean.jmx.GBeanMBean; +import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.kernel.Kernel; /** @@ -45,8 +46,8 @@ public void xtestStartAxisService() throws Exception { ClassLoader cl = getClass().getClassLoader(); ClassLoader myCl = new URLClassLoader(new URL[0], cl); - GBeanMBean gbean = new GBeanMBean(AxisGbean.getGBeanInfo(), myCl); - kernel.loadGBean(name, gbean); + GBeanData gbean = new GBeanData(name,AxisGbean.getGBeanInfo()); + kernel.loadGBean(gbean,myCl); kernel.startGBean(name); System.out.println(kernel.getAttribute(name, "state")); HttpURLConnection connection = (HttpURLConnection) AxisGeronimoUtils.getURL("/axis/index.html").openConnection(); @@ -77,7 +78,7 @@ protected void setUp() throws Exception { name = new ObjectName("test:name=AxisGBean"); - kernel = new Kernel("test.kernel", "test"); + kernel = new Kernel("test.kernel"); kernel.boot(); TestingUtils.startJ2EEContinerAndAxisServlet(kernel); } Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/EchoHeadersTest.java Wed Dec 8 00:11:24 2004 @@ -34,7 +34,7 @@ import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.geronimo.axis.testUtils.TestingUtils; -import org.apache.geronimo.gbean.jmx.GBeanMBean; +import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.kernel.Kernel; /** @@ -55,15 +55,15 @@ protected void setUp() throws Exception { name = new ObjectName("test:name=AxisGBean"); - kernel = new Kernel("test.kernel", "test"); + kernel = new Kernel("test.kernel"); kernel.boot(); ClassLoader cl = getClass().getClassLoader(); ClassLoader myCl = new URLClassLoader(new URL[]{}, cl); TestingUtils.startJ2EEContinerAndAxisServlet(kernel); - GBeanMBean gbean = new GBeanMBean(AxisGbean.getGBeanInfo(), myCl); + GBeanData gbean = new GBeanData(name,AxisGbean.getGBeanInfo()); gbean.setAttribute("Name", "Test"); - kernel.loadGBean(name, gbean); + kernel.loadGBean(gbean,myCl); kernel.startGBean(name); Service service = new Service(); service.getEngine().setOption(AxisEngine.PROP_XML_ENCODING, "UTF-8"); Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimpleEJBWebServiceTest.java Wed Dec 8 00:11:24 2004 @@ -22,19 +22,12 @@ import java.io.InputStreamReader; import java.lang.reflect.Method; import java.net.HttpURLConnection; -import java.net.URI; import java.net.URL; import java.net.URLClassLoader; -import java.util.Arrays; -import java.util.List; - -import javax.management.ObjectName; import org.apache.geronimo.axis.testUtils.TestingUtils; import org.apache.geronimo.gbean.WaitingException; -import org.apache.geronimo.gbean.jmx.GBeanMBean; import org.apache.geronimo.j2ee.deployment.EARConfigBuilder; -import org.apache.geronimo.kernel.config.ConfigurationManager; /** * @@ -51,12 +44,10 @@ ClassLoader myCl = new URLClassLoader(new URL[]{}, cl); File jarfile = new File(getTestFile("target/generated/samples/echo-jar/echo-ewsimpl.jar")); - ObjectName configName = new ObjectName("geronimo.test:name=" + jarfile.getName()); EARConfigBuilder earConfigBuilder = getEARConfigBuilder(); TestingUtils.buildConfiguration(jarfile,store,earConfigBuilder,kernel,wsConfgBuilderName); - //let us try to brows the WSDL of the service URL wsdlrequestUrl = AxisGeronimoUtils.getURL("/axis/services/echoPort?wsdl"); //+"/axis/services/AdminService?wsdl"); Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/SimplePOJOWebServiceTest.java Wed Dec 8 00:11:24 2004 @@ -28,7 +28,6 @@ import org.apache.axis.utils.ClassUtils; import org.apache.geronimo.axis.testUtils.TestingUtils; import org.apache.geronimo.gbean.WaitingException; -import org.apache.geronimo.gbean.jmx.GBeanMBean; import org.apache.geronimo.j2ee.deployment.EARConfigBuilder; /** * Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/preconditions/DynamicEJBDeploymentTest.java Wed Dec 8 00:11:24 2004 @@ -18,20 +18,16 @@ import java.io.File; import java.net.URI; -import java.util.jar.JarFile; import javax.management.ObjectName; import org.apache.geronimo.axis.AbstractTestCase; -import org.apache.geronimo.axis.EJBWSGBean; import org.apache.geronimo.axis.testUtils.AxisGeronimoConstants; import org.apache.geronimo.axis.testUtils.J2EEManager; import org.apache.geronimo.axis.testUtils.TestingUtils; -import org.apache.geronimo.gbean.jmx.GBeanMBean; import org.apache.geronimo.j2ee.deployment.EARConfigBuilder; import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder; import org.apache.geronimo.kernel.Kernel; -import org.apache.geronimo.kernel.config.ConfigurationManager; import org.apache.geronimo.kernel.jmx.JMXUtil; import org.openejb.deployment.OpenEJBModuleBuilder; Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/AxisGeronimoConstants.java Wed Dec 8 00:11:24 2004 @@ -23,7 +23,6 @@ import org.apache.geronimo.gbean.GBeanData; import org.apache.geronimo.kernel.jmx.JMXUtil; import org.apache.geronimo.system.configuration.LocalConfigStore; -import org.openejb.deployment.OpenEJBModuleBuilder; /** * @version $Rev: $ $Date: $ Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManager.java Wed Dec 8 00:11:24 2004 @@ -27,7 +27,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.geronimo.axis.AxisGeronimoUtils; import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator; -import org.apache.geronimo.gbean.jmx.GBeanMBean; +import org.apache.geronimo.gbean.GBeanData; +import org.apache.geronimo.gbean.GBeanInfo; import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl; import org.apache.geronimo.kernel.Kernel; import org.apache.geronimo.pool.ThreadPool; @@ -58,12 +59,15 @@ System.setProperty(javax.naming.Context.URL_PKG_PREFIXES, str); setUpTransactionManager(kernel); setUpTimer(kernel); - GBeanMBean serverInfoGBean = new GBeanMBean(ServerInfo.GBEAN_INFO); + + GBeanData serverInfoGBean = new GBeanData(AxisGeronimoConstants.J2EE_SERVER_INFO,ServerInfo.GBEAN_INFO); serverInfoGBean.setAttribute("baseDirectory", "."); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.J2EE_SERVER_INFO, serverInfoGBean, kernel); - GBeanMBean j2eeServerGBean = new GBeanMBean(J2EEServerImpl.GBEAN_INFO); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.J2EE_SERVER_INFO, + serverInfoGBean, kernel,Thread.currentThread().getContextClassLoader()); + + GBeanData j2eeServerGBean = new GBeanData(AxisGeronimoConstants.J2EE_SERVER_NAME,J2EEServerImpl.GBEAN_INFO); j2eeServerGBean.setReferencePatterns("ServerInfo", Collections.singleton(AxisGeronimoConstants.J2EE_SERVER_INFO)); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.J2EE_SERVER_NAME, j2eeServerGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.J2EE_SERVER_NAME, j2eeServerGBean, kernel,Thread.currentThread().getContextClassLoader()); // //load mock resource adapter for mdb @@ -90,19 +94,22 @@ private void setUpTransactionManager(Kernel kernel) throws AxisFault { try { - GBeanMBean tmGBean = new GBeanMBean(GeronimoTransactionManager.GBEAN_INFO); + GBeanData tmGBean = new GBeanData(AxisGeronimoConstants.TRANSACTION_MANAGER_NAME,GeronimoTransactionManager.GBEAN_INFO); Set rmpatterns = new HashSet(); rmpatterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*")); tmGBean.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10)); tmGBean.setReferencePatterns("ResourceManagers", rmpatterns); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTION_MANAGER_NAME, tmGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTION_MANAGER_NAME, tmGBean, + kernel,Thread.currentThread().getContextClassLoader()); - GBeanMBean tcmGBean = new GBeanMBean(TransactionContextManager.GBEAN_INFO); + GBeanData tcmGBean = new GBeanData(AxisGeronimoConstants.TRANSACTION_CONTEXT_MANAGER_NAME,TransactionContextManager.GBEAN_INFO); tcmGBean.setReferencePattern("TransactionManager", AxisGeronimoConstants.TRANSACTION_MANAGER_NAME); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTION_CONTEXT_MANAGER_NAME, tcmGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTION_CONTEXT_MANAGER_NAME, + tcmGBean, kernel,Thread.currentThread().getContextClassLoader()); - GBeanMBean trackedConnectionAssociator = new GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRACKED_CONNECTION_ASSOCIATOR_NAME, trackedConnectionAssociator, kernel); + GBeanData trackedConnectionAssociator = new GBeanData(AxisGeronimoConstants.TRACKED_CONNECTION_ASSOCIATOR_NAME,ConnectionTrackingCoordinator.GBEAN_INFO); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRACKED_CONNECTION_ASSOCIATOR_NAME, + trackedConnectionAssociator, kernel,Thread.currentThread().getContextClassLoader()); } catch (Exception e) { throw AxisFault.makeFault(e); } @@ -119,21 +126,24 @@ } public static void setUpTimer(Kernel kernel) throws Exception { - GBeanMBean threadPoolGBean = new GBeanMBean(ThreadPool.GBEAN_INFO); + GBeanData threadPoolGBean = new GBeanData(AxisGeronimoConstants.THREADPOOL_NAME,ThreadPool.GBEAN_INFO); threadPoolGBean.setAttribute("keepAliveTime", new Integer(5000)); threadPoolGBean.setAttribute("poolSize", new Integer(5)); threadPoolGBean.setAttribute("poolName", "DefaultThreadPool"); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.THREADPOOL_NAME, threadPoolGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.THREADPOOL_NAME, threadPoolGBean, + kernel,Thread.currentThread().getContextClassLoader()); - GBeanMBean transactionalTimerGBean = new GBeanMBean(VMStoreThreadPooledTransactionalTimer.GBEAN_INFO); + GBeanData transactionalTimerGBean = new GBeanData(AxisGeronimoConstants.TRANSACTIONAL_TIMER_NAME,VMStoreThreadPooledTransactionalTimer.GBEAN_INFO); transactionalTimerGBean.setAttribute("repeatCount", new Integer(5)); transactionalTimerGBean.setReferencePattern("TransactionContextManager", AxisGeronimoConstants.TRANSACTION_CONTEXT_MANAGER_NAME); transactionalTimerGBean.setReferencePattern("ThreadPool", AxisGeronimoConstants.THREADPOOL_NAME); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTIONAL_TIMER_NAME, transactionalTimerGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.TRANSACTIONAL_TIMER_NAME, transactionalTimerGBean, + kernel,Thread.currentThread().getContextClassLoader()); - GBeanMBean nonTransactionalTimerGBean = new GBeanMBean(VMStoreThreadPooledNonTransactionalTimer.GBEAN_INFO); + GBeanData nonTransactionalTimerGBean = new GBeanData(AxisGeronimoConstants.NONTRANSACTIONAL_TIMER_NAME,VMStoreThreadPooledNonTransactionalTimer.GBEAN_INFO); nonTransactionalTimerGBean.setReferencePattern("ThreadPool", AxisGeronimoConstants.THREADPOOL_NAME); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.NONTRANSACTIONAL_TIMER_NAME, nonTransactionalTimerGBean, kernel); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.NONTRANSACTIONAL_TIMER_NAME, + nonTransactionalTimerGBean, kernel,Thread.currentThread().getContextClassLoader()); } private void stopTimer(Kernel kernel) throws AxisFault { @@ -148,12 +158,22 @@ public void startWebContainer(Kernel kernel) throws Exception { Set containerPatterns = Collections.singleton(AxisGeronimoConstants.WEB_CONTAINER_NAME); - GBeanMBean container = new GBeanMBean("org.apache.geronimo.jetty.JettyContainerImpl"); - GBeanMBean connector = new GBeanMBean("org.apache.geronimo.jetty.connector.HTTPConnector"); + + Class jettyClass = Class.forName("org.apache.geronimo.jetty.JettyContainerImpl"); + GBeanInfo jettyinfo = (GBeanInfo)jettyClass.getMethod("getGBeanInfo",null).invoke(null,null); + GBeanData container = new GBeanData(AxisGeronimoConstants.WEB_CONTAINER_NAME,jettyinfo); + + Class jconnectorClass = Class.forName("org.apache.geronimo.jetty.connector.HTTPConnector"); + GBeanInfo connectorinfo = (GBeanInfo)jconnectorClass.getMethod("getGBeanInfo",null).invoke(null,null); + GBeanData connector = new GBeanData(AxisGeronimoConstants.WEB_CONNECTOR_NAME,connectorinfo); + connector.setAttribute("port", new Integer(AxisGeronimoUtils.AXIS_SERVICE_PORT)); connector.setReferencePatterns("JettyContainer", containerPatterns); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.WEB_CONTAINER_NAME, container, kernel); - AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.WEB_CONNECTOR_NAME, connector, kernel); + + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.WEB_CONTAINER_NAME, container, + kernel,Thread.currentThread().getContextClassLoader()); + AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.WEB_CONNECTOR_NAME, connector, + kernel,Thread.currentThread().getContextClassLoader()); } private void stopWebContainer(Kernel kernel) throws AxisFault { @@ -166,7 +186,11 @@ } public void startEJBContainer(Kernel kernel) throws Exception { - GBeanMBean containerIndexGBean = new GBeanMBean("org.openejb.ContainerIndex"); + Class ciClass = Class.forName("org.openejb.ContainerIndex"); + GBeanInfo ciinfo = (GBeanInfo)ciClass.getMethod("getGBeanInfo",null).invoke(null,null); + GBeanData containerIndexGBean = new GBeanData(AxisGeronimoConstants.EJB_CONTAINER_NAME,ciinfo); + + Set ejbContainerNames = new HashSet(); ejbContainerNames.add(ObjectName.getInstance(AxisGeronimoConstants.J2EE_DOMAIN_NAME + ":j2eeType=StatelessSessionBean,*")); @@ -177,7 +201,7 @@ containerIndexGBean.setReferencePatterns("EJBContainers", ejbContainerNames); AxisGeronimoUtils.startGBeanOnlyIfNotStarted(AxisGeronimoConstants.EJB_CONTAINER_NAME, - containerIndexGBean, kernel); + containerIndexGBean, kernel,Thread.currentThread().getContextClassLoader()); } private void stopEJBContainer(Kernel kernel) throws AxisFault { Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/J2EEManagerTest.java Wed Dec 8 00:11:24 2004 @@ -41,7 +41,7 @@ protected void setUp() throws Exception { name = new ObjectName("test:name=AxisGBean"); - kernel = new Kernel("test.kernel", "test"); + kernel = new Kernel("test.kernel"); kernel.boot(); } Deleted: /geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/JettyServiceWrapper.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/JettyServiceWrapper.java?view=auto&rev=111233 ============================================================================== Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/axis/src/test/org/apache/geronimo/axis/testUtils/TestingUtils.java Wed Dec 8 00:11:24 2004 @@ -154,6 +154,8 @@ JarFile module = new JarFile(jarfile); File unpackedDir = store.createNewConfigurationDir(); + System.out.println("\nHI HELLO" + unpackedDir.getAbsolutePath()); + //Install the EJB Object ejbplan = earConfigBuilder.getDeploymentPlan(null, module); earConfigBuilder.buildConfiguration(ejbplan, module, unpackedDir); @@ -162,7 +164,7 @@ GBeanData config = store.getConfiguration(ejbURI); ConfigurationManager configurationManager = kernel.getConfigurationManager(); - ObjectName configName = configurationManager.load(config, store.getBaseURL(ejbURI), Configuration.class.getClassLoader()); + ObjectName configName = configurationManager.load(config, store.getBaseURL(ejbURI), Thread.currentThread().getContextClassLoader()); kernel.startRecursiveGBean(configName); return configName; } Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/maven.xml Wed Dec 8 00:11:24 2004 @@ -51,42 +51,5 @@ <copy todir="${maven.build.dest}/META-INF/geronimo-service.xml" file="src/plan/tomcat-plan.xml"/> </preGoal> - <postGoal name="jar:jar"> - - <j:set var="geronimoHome" value="../assembly/target/${pom.groupId}-${pom.currentVersion}"/> - - <!-- - - TODO: There must be a better way! - - copy the dependencies (specified in tomcat-plan.xml) - --> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/geronimo/jars" - file="target/${maven.final.name}.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars"> - <!-- Don't want to break the other modules that rely on the libs --> - <!-- fileset dir="${maven.repo.local}/tomcat/jars" includes="*-&tomcat-version;.jar"/ --> - <fileset dir="${maven.repo.local}/tomcat/jars" includes="*-5.5.4.jar"/> - </copy> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-beanutils/jars" - file="${maven.repo.local}/commons-beanutils/jars/commons-beanutils-&commons-beanutils-version;.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-collections/jars" - file="${maven.repo.local}/commons-collections/jars/commons-collections-&commons-collections-version;.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-digester/jars" - file="${maven.repo.local}/commons-digester/jars/commons-digester-&commons-digester-version;.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-modeler/jars" - file="${maven.repo.local}/commons-modeler/jars/commons-modeler-&commons-modeler-version;.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/xerces/jars" - file="${maven.repo.local}/xerces/jars/xercesImpl-&xerces-version;.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/mx4j/jars" - file="${maven.repo.local}/mx4j/jars/mx4j-&mx4j-version;.jar"/> - - <copy todir="${geronimoHome}/var/catalina/conf" file="src/var/web.xml"/> - - <echo>Deploying Apache Tomcat configuration</echo> - <java fork="true" jar="../assembly/target/geronimo-${pom.currentVersion}/bin/deployer.jar" failonerror="true"> - <jvmarg value="-ea"/> - <arg value="distribute"/> - <arg value="src/plan/tomcat-plan.xml"/> - </java> - </postGoal> </project> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/project.xml Wed Dec 8 00:11:24 2004 @@ -104,6 +104,21 @@ <repository>true</repository> </properties> </dependency> + <!-- + - Required until any realm is provided to Tomcat + - See StandardEngine::getRealm() + --> + <dependency> + <groupId>tomcat</groupId> + <artifactId>catalina-optional</artifactId> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>tomcat-coyote</artifactId> Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Wed Dec 8 00:11:24 2004 @@ -16,6 +16,8 @@ */ package org.apache.geronimo.tomcat; +import mx4j.log.FileLogger; + import org.apache.catalina.Context; import org.apache.catalina.Engine; import org.apache.catalina.Host; @@ -39,11 +41,16 @@ public class TomcatContainer implements GBeanLifecycle { private static final Log log = LogFactory.getLog(TomcatContainer.class); - + /** * The default value of CATALINA_HOME variable */ private static final String CATALINA_HOME = "var/catalina"; + + /** + * Work directory + */ + private static final String WORK_DIR = "work"; /** * Reference to the org.apache.catalina.Embedded embedded. @@ -105,6 +112,13 @@ embedded = new Embedded(); } + // Assemble FileLogger as a gbean + /* + * FileLogger fileLog = new FileLogger(); fileLog.setDirectory("."); + * fileLog.setPrefix("vsjMbedTC5"); fileLog.setSuffix(".log"); + * fileLog.setTimestamp(true); + */ + // 2. Set the relevant properties of this object itself. In particular, // you will want to establish the default Logger to be used, as well as // the default Realm if you are using container-managed security. @@ -113,7 +127,7 @@ // 3. Call createEngine() to create an Engine object, and then call its // property setters as desired. engine = embedded.createEngine(); - engine.setName("Geronimo"); + engine.setName("tomcat.engine"); engine.setDefaultHost("localhost"); // 4. Call createHost() to create at least one virtual Host associated @@ -122,7 +136,7 @@ // Engine with engine.addChild(host). host = embedded.createHost("localhost", ""); // TODO: Make it that gbean's attribute or tomcatwebappcontext's one - ((StandardHost) host).setWorkDir(CATALINA_HOME); + ((StandardHost) host).setWorkDir(WORK_DIR); engine.addChild(host); @@ -132,6 +146,7 @@ // zero-length string, which will be used to process all requests not // mapped to some other Context. After you customize this Context, add // it to the corresponding Host with host.addChild(context). + // TODO: Make a default webapp configurable - another gbean? defaultContext = embedded.createContext("", ""); defaultContext.setParentClassLoader(this.getClass().getClassLoader()); host.addChild(defaultContext); @@ -179,8 +194,14 @@ * @see org.apache.catalina.Host */ public void addContext(Context ctx) { - ctx.setParentClassLoader(this.getClass().getClassLoader()); - host.addChild(ctx); + // TODO: Rethink what we're doing here + // The param - ctx - extends StandardContext, but at the same time we don't leverage it. + // TomcatContainer creates it again - so in fact there're two classes for the same thing. + // The question comes up what do we get from having the + // TomcatWebAppContext class extend Tomcat's StandardContext? + Context anotherCtxObj = embedded.createContext(ctx.getPath(), ctx.getDocBase()); + anotherCtxObj.setParentClassLoader(this.getClass().getClassLoader()); + host.addChild(anotherCtxObj); } public void removeContext(Context ctx) { Modified: geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Url: http://svn.apache.org/viewcvs/geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&rev=111234&p1=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java&r1=111233&p2=geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java&r2=111234 ============================================================================== --- geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original) +++ geronimo/branches/djencks/jetty-deployer1/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Wed Dec 8 00:11:24 2004 @@ -23,7 +23,6 @@ import org.apache.catalina.LifecycleException; import org.apache.catalina.core.StandardContext; -import org.apache.catalina.loader.WebappClassLoader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.geronimo.gbean.GBeanInfo; @@ -60,8 +59,10 @@ public void doStart() throws WaitingException, Exception { + // See the note of TomcatContainer::addContext container.addContext(this); - super.start(); + // Is it necessary - doesn't Tomcat Embedded take care of it? + // super.start(); log.info("TomcatWebAppContext started"); }
