geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r208886 - in /geronimo/trunk/modules: deploy-jsr88/ deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/ jetty-builder/ jetty-builder/src/java/org/apache/geronimo/jett...
Date Sun, 03 Jul 2005 05:30:28 GMT
Author: ammulder
Date: Sat Jul  2 22:30:26 2005
New Revision: 208886

URL: http://svn.apache.org/viewcvs?rev=208886&view=rev
Log:
Migrate Jetty to new unified web deployment plan format

Removed:
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WARConfiguration.java
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WARConfigurer.java
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigBean.java
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/WebAppDConfigRoot.java
    geronimo/trunk/modules/jetty-builder/src/schema/
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/WebAppDConfigTest.java
Modified:
    geronimo/trunk/modules/deploy-jsr88/project.xml
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
    geronimo/trunk/modules/jetty-builder/maven.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java

Modified: geronimo/trunk/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/project.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/project.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/project.xml Sat Jul  2 22:30:26 2005
@@ -111,7 +111,7 @@
 
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-jetty-builder</artifactId>
+            <artifactId>geronimo-web-builder</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
 

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
(original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
Sat Jul  2 22:30:26 2005
@@ -31,7 +31,7 @@
 import java.io.File;
 import java.io.InputStream;
 import org.apache.geronimo.connector.deployment.RARConfigurer;
-import org.apache.geronimo.jetty.deployment.WARConfigurer;
+import org.apache.geronimo.web.deployment.WARConfigurer;
 import org.openejb.deployment.EJBConfigurer;
 
 /**

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
(original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Sat Jul  2 22:30:26 2005
@@ -53,7 +53,7 @@
 import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.connector.deployment.RARConfigurer;
-import org.apache.geronimo.jetty.deployment.WARConfigurer;
+import org.apache.geronimo.web.deployment.WARConfigurer;
 import org.openejb.deployment.EJBConfigurer;
 
 

Modified: geronimo/trunk/modules/jetty-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/maven.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/maven.xml (original)
+++ geronimo/trunk/modules/jetty-builder/maven.xml Sat Jul  2 22:30:26 2005
@@ -22,16 +22,6 @@
 <project default="default"
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
-    xmlns:maven="jelly:maven"
-    xmlns:xmlbeans="geronimo:xmlbeans">
-
-    <preGoal name="java:compile">
-        <xmlbeans:schema2java
-            sourcedir="${basedir}/src"
-            sourceschema="schema/geronimo-jetty.xsd"
-            xmlconfigs="${basedir}/src/schema/xmlconfig.xml"
-            targetdir="${basedir}/target/xmlbeans"
-            cataloglocation="${basedir}/../j2ee-schema/src/catalog/resolver-catalog.xml"/>
-    </preGoal>
+    xmlns:maven="jelly:maven">
 
 </project>

Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Sat Jul  2 22:30:26 2005
@@ -94,6 +94,15 @@
             </properties>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <xmlbeans>true</xmlbeans>
+            </properties>
+        </dependency>
+
        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-jetty</artifactId>

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Sat Jul  2 22:30:26 2005
@@ -80,8 +80,8 @@
 import org.apache.geronimo.security.jacc.ComponentPermissions;
 import org.apache.geronimo.security.util.URLPattern;
 import org.apache.geronimo.transaction.context.OnlineUserTransaction;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
 import org.apache.geronimo.xbeans.j2ee.DispatcherType;
 import org.apache.geronimo.xbeans.j2ee.ErrorPageType;
 import org.apache.geronimo.xbeans.j2ee.FilterMappingType;
@@ -201,7 +201,7 @@
         check(webApp);
 
         // parse vendor dd
-        JettyWebAppType jettyWebApp = getJettyWebApp(plan, moduleFile, standAlone, targetPath,
webApp);
+        GerWebAppType jettyWebApp = getJettyWebApp(plan, moduleFile, standAlone, targetPath,
webApp);
         if (contextRoot == null) {
             contextRoot = jettyWebApp.getContextRoot();
         }
@@ -260,22 +260,22 @@
         return map;
     }
 
-    JettyWebAppType getJettyWebApp(Object plan, JarFile moduleFile, boolean standAlone, String
targetPath, WebAppType webApp) throws DeploymentException {
-        JettyWebAppType jettyWebApp = null;
+    GerWebAppType getJettyWebApp(Object plan, JarFile moduleFile, boolean standAlone, String
targetPath, WebAppType webApp) throws DeploymentException {
+        GerWebAppType jettyWebApp = null;
         try {
-            // load the geronimo-jetty.xml from either the supplied plan or from the earFile
+            // load the geronimo-web.xml from either the supplied plan or from the earFile
             try {
                 if (plan instanceof XmlObject) {
-                    jettyWebApp = (JettyWebAppType) SchemaConversionUtils.getNestedObjectAsType((XmlObject)
plan,
+                    jettyWebApp = (GerWebAppType) SchemaConversionUtils.getNestedObjectAsType((XmlObject)
plan,
                             "web-app",
-                            JettyWebAppType.type);
+                            GerWebAppType.type);
                 } else {
-                    JettyWebAppDocument jettyWebAppdoc = null;
+                    GerWebAppDocument jettyWebAppdoc = null;
                     if (plan != null) {
-                        jettyWebAppdoc = JettyWebAppDocument.Factory.parse((File) plan);
+                        jettyWebAppdoc = GerWebAppDocument.Factory.parse((File) plan);
                     } else {
-                        URL path = DeploymentUtil.createJarURL(moduleFile, "WEB-INF/geronimo-jetty.xml");
-                        jettyWebAppdoc = JettyWebAppDocument.Factory.parse(path);
+                        URL path = DeploymentUtil.createJarURL(moduleFile, "WEB-INF/geronimo-web.xml");
+                        jettyWebAppdoc = GerWebAppDocument.Factory.parse(path);
                     }
                     if (jettyWebAppdoc != null) {
                         jettyWebApp = jettyWebAppdoc.getWebApp();
@@ -286,9 +286,9 @@
 
             // if we got one extract and validate it otherwise create a default one
             if (jettyWebApp != null) {
-                jettyWebApp = (JettyWebAppType) SchemaConversionUtils.convertToGeronimoNamingSchema(jettyWebApp);
-                jettyWebApp = (JettyWebAppType) SchemaConversionUtils.convertToGeronimoSecuritySchema(jettyWebApp);
-                jettyWebApp = (JettyWebAppType) SchemaConversionUtils.convertToGeronimoServiceSchema(jettyWebApp);
+                jettyWebApp = (GerWebAppType) SchemaConversionUtils.convertToGeronimoNamingSchema(jettyWebApp);
+                jettyWebApp = (GerWebAppType) SchemaConversionUtils.convertToGeronimoSecuritySchema(jettyWebApp);
+                jettyWebApp = (GerWebAppType) SchemaConversionUtils.convertToGeronimoServiceSchema(jettyWebApp);
                 SchemaConversionUtils.validateDD(jettyWebApp);
             } else {
                 String path;
@@ -307,7 +307,7 @@
         return jettyWebApp;
     }
 
-    private JettyWebAppType createDefaultPlan(String path, WebAppType webApp) {
+    private GerWebAppType createDefaultPlan(String path, WebAppType webApp) {
         String id = webApp.getId();
         if (id == null) {
             id = path;
@@ -319,7 +319,7 @@
             }
         }
 
-        JettyWebAppType jettyWebApp = JettyWebAppType.Factory.newInstance();
+        GerWebAppType jettyWebApp = GerWebAppType.Factory.newInstance();
 
         // set the parentId, configId and context root
         jettyWebApp.setParentId(defaultParentId.toString());
@@ -353,8 +353,8 @@
             // and the url class loader will not pick up a manifiest from an unpacked dir
             earContext.addManifestClassPath(warFile, URI.create(module.getTargetPath()));
 
-            // add the dependencies declared in the geronimo-jetty.xml file
-            JettyWebAppType jettyWebApp = (JettyWebAppType) module.getVendorDD();
+            // add the dependencies declared in the geronimo-web.xml file
+            GerWebAppType jettyWebApp = (GerWebAppType) module.getVendorDD();
             DependencyType[] dependencies = jettyWebApp.getDependencyArray();
             ServiceConfigBuilder.addDependencies(earContext, dependencies, repository);
         } catch (IOException e) {
@@ -374,7 +374,7 @@
         WebModule webModule = (WebModule) module;
 
         WebAppType webApp = (WebAppType) webModule.getSpecDD();
-        JettyWebAppType jettyWebApp = (JettyWebAppType) webModule.getVendorDD();
+        GerWebAppType jettyWebApp = (GerWebAppType) webModule.getVendorDD();
 
         boolean contextPriorityClassLoader = false;
         if (jettyWebApp != null) {
@@ -1129,7 +1129,7 @@
         }
     }
 
-    private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType
webApp, JettyWebAppType jettyWebApp, UserTransaction userTransaction, ClassLoader cl) throws
DeploymentException {
+    private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType
webApp, GerWebAppType jettyWebApp, UserTransaction userTransaction, ClassLoader cl) throws
DeploymentException {
         return ENCConfigBuilder.buildComponentContext(earContext,
                 webModule,
                 userTransaction,

Modified: geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Sat Jul  2 22:30:26 2005
@@ -17,7 +17,7 @@
 -->
 
 <jetty:web-app
-    xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"
+    xmlns:jetty="http://geronimo.apache.org/xml/ns/web"
     configId="org/apache/geronimo/jetty/Test"
     >
     <jetty:context-root>/test</jetty:context-root>

Modified: geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Sat Jul  2 22:30:26 2005
@@ -17,7 +17,7 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+    xmlns="http://geronimo.apache.org/xml/ns/web"
     xmlns:sec="http://geronimo.apache.org/xml/ns/security"
     configId="org/apache/geronimo/test">
 

Modified: geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml Sat Jul  2 22:30:26
2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://geronimo.apache.org/xml/ns/web/jetty"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/web"
     configId="goodservlet"
     parentId="org/apache/geronimo/DefaultDatabase">
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=208886&r1=208885&r2=208886&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
Sat Jul  2 22:30:26 2005
@@ -6,8 +6,8 @@
 import junit.framework.TestCase;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.schema.SchemaConversionUtils;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppDocument;
-import org.apache.geronimo.xbeans.geronimo.jetty.JettyWebAppType;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 
@@ -23,13 +23,13 @@
     public void testResourceRef() throws Exception {
         File resourcePlan = new File(basedir, "src/test-resources/plans/plan1.xml");
         assertTrue(resourcePlan.exists());
-        JettyWebAppType jettyWebApp = builder.getJettyWebApp(resourcePlan, null, true, null,
null);
+        GerWebAppType jettyWebApp = builder.getJettyWebApp(resourcePlan, null, true, null,
null);
         assertEquals(1, jettyWebApp.getResourceRefArray().length);
     }
 
     public void testConstructPlan() throws Exception {
-        JettyWebAppDocument jettyWebAppDoc = JettyWebAppDocument.Factory.newInstance();
-        JettyWebAppType jettyWebAppType = jettyWebAppDoc.addNewWebApp();
+        GerWebAppDocument jettyWebAppDoc = GerWebAppDocument.Factory.newInstance();
+        GerWebAppType jettyWebAppType = jettyWebAppDoc.addNewWebApp();
         jettyWebAppType.setConfigId("configId");
         jettyWebAppType.setParentId("parentId");
         jettyWebAppType.setContextPriorityClassloader(false);



Mime
View raw message