cvs commit: incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment DeployerTestCase.java DeploymentTest.java WARConfigurationFactoryTest.java WebAppDConfigTest.java
jboynes 2004/02/20 16:54:04 Removed: modules/jetty/src/java/org/apache/geronimo/jetty/deployment AbstractModule.java JettyModule.java UnpackedModule.java WARConfigurationFactory.java modules/jetty/src/test/org/apache/geronimo/jetty/deployment DeployerTestCase.java DeploymentTest.java WARConfigurationFactoryTest.java WebAppDConfigTest.java Log: Functionality moved to ModuleConfigurer and ConfigurationBuilder impls
cvs commit: incubator-geronimo/modules/connector/src/test-data/connector_1_5 geronimo-ra.xml
djencks 2004/02/20 17:10:50 Modified: modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean AdminObjectInstance.java ConfigPropertySettingDConfigBean.java ConfigPropertySettings.java ConnectionDefinitionDConfigBean.java ConnectionDefinitionInstance.java ResourceAdapterDConfigBean.java ResourceAdapterDConfigRoot.java ResourceAdapter_1_0DConfigRoot.java modules/connector/src/schema geronimo-connector_1_5.xsd modules/connector/src/test-data/connector_1_0 geronimo-ra.xml modules/connector/src/test-data/connector_1_5 geronimo-ra.xml Added: modules/connector/src/java/org/apache/geronimo/connector/deployment AbstractRARConfigBuilder.java RAR_1_0ConfigBuilder.java RAR_1_5ConfigBuilder.java modules/connector/src/test/org/apache/geronimo/connector/deployment RAR_1_0ConfigBuilderTest.java RAR_1_0DConfigBeanTest.java RAR_1_5ConfigBuilderTest.java RAR_1_5DConfigBeanTest.java Removed: modules/connector/src/java/org/apache/geronimo/connector/deployment AbstractConnectorModule.java Connector_1_0Module.java Connector_1_5Module.java RARConfigurationFactory.java modules/connector/src/test/org/apache/geronimo/connector/deployment Connector_1_0Test.java Connector_1_5Test.java Log: Switch to ConfigurationBuilder/Configurer implementations Revision ChangesPath 1.1 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/AbstractRARConfigBuilder.java?rev=1.1 1.1 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_0ConfigBuilder.java?rev=1.1 1.1 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/RAR_1_5ConfigBuilder.java?rev=1.1 1.3 +5 -5 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectInstance.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectInstance.java.diff?r1=1.2r2=1.3 1.4 +2 -2 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettingDConfigBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettingDConfigBean.java.diff?r1=1.3r2=1.4 1.3 +15 -15 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettings.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConfigPropertySettings.java.diff?r1=1.2r2=1.3 1.4 +6 -6 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionDConfigBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionDConfigBean.java.diff?r1=1.3r2=1.4 1.5 +4 -4 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ConnectionDefinitionInstance.java.diff?r1=1.4r2=1.5 1.7 +3 -3 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigBean.java http://cvs.apache.org/viewcvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/ResourceAdapterDConfigBean.java.diff?r1=1.6r2=1.7 1.5 +2 -2
cvs commit: incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment WebAppDConfigTest.java
jboynes 2004/02/20 18:27:43 Added: modules/jetty/src/test/org/apache/geronimo/jetty/deployment WebAppDConfigTest.java Log: Readd, but without dependency on DeployerTestCase Revision ChangesPath 1.10 +5 -5 incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java
[Apache Geronimo Wiki] Updated: IntroduceYourself
Date: 2004-02-21T03:29:09 Editor: PhilipMarkDonaghy [EMAIL PROTECTED] Wiki: Apache Geronimo Wiki Page: IntroduceYourself URL: http://wiki.apache.org/geronimo/IntroduceYourself Modified my name, link, and location Change Log: -- @@ -108,7 +108,7 @@ || Simon Matic Langford || Leamington Spa || Warwickshire || UK || J2EE developer || || Sergio Eduardo Rodrigues || São Paulo || São Paulo || Brazil || J2EE Developer || || Massimiliano Parlione || Teramo || Abruzzo || Italy || Java Developer || -|| Philip Mark Donaghy || Paris || IDF || France || Open Source GIS and Java || +|| Philip Mark Donaghy || Lege Cap-Ferret || Aquitaine || France || [http://www.mapimage.com Open Source GIS and Java Architect] || || Bret Hansen || Coalville || UT || USA || Java Architect and Evangelist || || Uwe Kaczmarek || Pforzheim || BWT || Germany || || || Sagolsem B. || New Delhi || Delhi || India || Distributive Computing Enthusiast ||
cvs commit: incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean AdminObjectDConfigBean.java
ammulder2004/02/21 08:40:00 Modified: modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean AdminObjectDConfigBean.java Log: Fix property name in PropertyChangeEvent Revision ChangesPath 1.3 +2 -2 incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectDConfigBean.java Index: AdminObjectDConfigBean.java === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/java/org/apache/geronimo/connector/deployment/dconfigbean/AdminObjectDConfigBean.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AdminObjectDConfigBean.java 18 Feb 2004 20:57:07 - 1.2 +++ AdminObjectDConfigBean.java 21 Feb 2004 16:40:00 - 1.3 @@ -137,7 +137,7 @@ instance.dispose(); } } -pcs.firePropertyChange(connectionDefinitionInstance, old, instances); +pcs.firePropertyChange(adminObjectInstance, old, instances); } }
cvs commit: incubator-geronimo/modules/assembly/src/plan deployer-config.xml
jboynes 2004/02/21 08:55:46 Modified:modules/assembly/src/plan deployer-config.xml Log: Needs xmlbeans for standard DDs Revision ChangesPath 1.3 +3 -0 incubator-geronimo/modules/assembly/src/plan/deployer-config.xml Index: deployer-config.xml === RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/deployer-config.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- deployer-config.xml 20 Feb 2004 21:06:19 - 1.2 +++ deployer-config.xml 21 Feb 2004 16:55:45 - 1.3 @@ -32,6 +32,9 @@ urigeronimo-spec/jars/geronimo-spec-j2ee-DEV.jar/uri /include include +urigeronimo-spec/jars/geronimo-spec-j2eeschema-DEV.jar/uri +/include +include urilog4j/jars/log4j-1.2.8.jar/uri /include include
cvs commit: incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment WARConfigBuilder.java
jboynes 2004/02/21 09:41:55
Modified:modules/jetty/src/java/org/apache/geronimo/jetty/deployment
WARConfigBuilder.java
Log:
Include JNDI environment
Revision ChangesPath
1.7 +73 -23
incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java
Index: WARConfigBuilder.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/jetty/src/java/org/apache/geronimo/jetty/deployment/WARConfigBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WARConfigBuilder.java 20 Feb 2004 23:18:00 - 1.6
+++ WARConfigBuilder.java 21 Feb 2004 17:41:55 - 1.7
@@ -56,6 +56,8 @@
package org.apache.geronimo.jetty.deployment;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -68,8 +70,10 @@
import java.util.Properties;
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import javax.naming.NamingException;
import org.apache.geronimo.deployment.ConfigurationBuilder;
import org.apache.geronimo.deployment.DeploymentContext;
@@ -90,6 +94,10 @@
import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument;
import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
+import org.apache.geronimo.xbeans.j2ee.WebAppType;
+import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
+import org.apache.geronimo.naming.java.ReadOnlyContext;
+import org.apache.geronimo.naming.java.ComponentContextBuilder;
import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.SchemaTypeLoader;
import org.apache.xmlbeans.XmlBeans;
@@ -124,7 +132,7 @@
if (module.toString().endsWith(/)) {
moduleBase = module;
} else {
-moduleBase = new URL(jar:+module.toString()+!/);
+moduleBase = new URL(jar: + module.toString() + !/);
}
XmlObject plan = getPlan(new URL(moduleBase,
WEB-INF/geronimo-jetty.xml), JettyWebAppDocument.type);
// todo needs generic web XMLBeans
@@ -158,6 +166,7 @@
}
public void buildConfiguration(File outfile, JarInputStream module,
XmlObject plan) throws IOException, DeploymentException {
+WebAppType webApp = null;
JettyWebAppType jettyWebApp = ((JettyWebAppDocument)
plan).getWebApp();
URI configID;
try {
@@ -188,7 +197,26 @@
// add the warfile's content to the configuration
URI warRoot = URI.create(war/);
-context.addArchive(warRoot, module);
+ZipEntry src;
+while ((src = module.getNextEntry()) != null) {
+URI target = warRoot.resolve(src.getName());
+if (WEB-INF/web.xml.equals(src.getName())) {
+byte[] buffer = getBytes(module);
+context.addFile(target, new
ByteArrayInputStream(buffer));
+try {
+WebAppDocument doc = (WebAppDocument)
XmlBeans.getContextTypeLoader().parse(new ByteArrayInputStream(buffer),
WebAppDocument.type, null);
+webApp = doc.getWebApp();
+} catch (XmlException e) {
+throw new DeploymentException(Unable to parse
web.xml);
+}
+} else {
+context.addFile(target, module);
+}
+}
+
+if (webApp == null) {
+throw new DeploymentException(Did not find WEB-INF/web.xml
in module);
+}
context.addToClassPath(warRoot);
// todo do we need to support include and dependency or can we
rely on the parent?
@@ -200,7 +228,7 @@
// add the GBean for the web application
-addWebAppGBean(context, jettyWebApp, warRoot);
+addWebAppGBean(context, webApp, jettyWebApp, warRoot);
// todo do we need to add GBeans to make the servlets JSR77
ManagedObjects?
@@ -211,8 +239,18 @@
}
}
-private void addWebAppGBean(DeploymentContext context, JettyWebAppType
webApp, URI warRoot) throws DeploymentException {
-String contextRoot = webApp.getContextRoot().trim();
+private byte[] getBytes(InputStream is) throws IOException {
+byte[] buffer = new byte[4096];
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
cvs commit: incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment Deployer.java
jboynes 2004/02/21 12:03:24
Modified:modules/deployment/src/java/org/apache/geronimo/deployment
Deployer.java
Log:
Ensure filename is URL encoded
Revision ChangesPath
1.9 +3 -3
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Index: Deployer.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Deployer.java 20 Feb 2004 21:04:02 - 1.8
+++ Deployer.java 21 Feb 2004 20:03:24 - 1.9
@@ -298,9 +298,9 @@
private static URL getURL(String location) throws MalformedURLException {
File f = new File(location);
if (f.exists() f.canRead()) {
-return f.toURL();
+return f.toURI().toURL();
}
-return new URL(new File(.).toURL(), location);
+return new File(.).toURI().resolve(location).toURL();
}
private static class Command {
