You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/10 12:07:10 UTC
svn commit: r610760 - in /geronimo/server/trunk:
framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/
framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/
plugins/clien...
Author: djencks
Date: Thu Jan 10 03:07:04 2008
New Revision: 610760
URL: http://svn.apache.org/viewvc?rev=610760&view=rev
Log:
GERONIMO-3742 Split up namespace upgrades into the modules that need them
Modified:
geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan1.xml
geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan2.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-car.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-ejb-jar.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-rar.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-war.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-pre.xml
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre.xml
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre2.xml
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre3.xml
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/web-md-pre.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testBuiltGBeans.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testOverrideDefaults.xml
Modified: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java Thu Jan 10 03:07:04 2008
@@ -46,58 +46,16 @@
private static final Map<QName, QNameSet> substitutionGroups = new HashMap<QName, QNameSet>();
private static final XmlObject[] NO_ELEMENTS = new XmlObject[]{};
- static {
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.1", "http://geronimo.apache.org/xml/ns/deployment-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment/javabean", "http://geronimo.apache.org/xml/ns/deployment/javabean-1.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.1", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.2", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming", "http://geronimo.apache.org/xml/ns/naming-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.1", "http://geronimo.apache.org/xml/ns/naming-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.2", "http://geronimo.apache.org/xml/ns/security-2.0");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
- NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.2", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.3", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/pkgen", "http://openejb.apache.org/xml/ns/pkgen-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/pkgen-2.0", "http://openejb.apache.org/xml/ns/pkgen-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-css-config_1_0", "http://openejb.apache.org/xml/ns/corba-css-config-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-css-config-2.0", "http://openejb.apache.org/xml/ns/corba-css-config-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config_1_0", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config-2.0", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
- NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config-2.1", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
+ private XmlBeansUtil() {
}
- private XmlBeansUtil() {
+ public static void registerNamespaceUpdates(Map<String, String> updates) {
+ NAMESPACE_UPDATES.putAll(updates);
}
+ public static void unregisterNamespaceUpdates(Map<String, String> updates) {
+ NAMESPACE_UPDATES.entrySet().removeAll(updates.entrySet());
+ }
public static XmlObject parse(File file) throws IOException, XmlException {
ArrayList errors = new ArrayList();
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Thu Jan 10 03:07:04 2008
@@ -25,6 +25,8 @@
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
+import java.util.HashMap;
import java.util.jar.JarFile;
import javax.xml.namespace.QName;
@@ -44,6 +46,7 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
@@ -63,12 +66,19 @@
/**
* @version $Rev$ $Date$
*/
-public class ServiceConfigBuilder implements ConfigurationBuilder {
+public class ServiceConfigBuilder implements ConfigurationBuilder, GBeanLifecycle {
private final Environment defaultEnvironment;
private final Collection repositories;
private static final QName MODULE_QNAME = ModuleDocument.type.getDocumentElementName();
public static final String SERVICE_MODULE = "ServiceModule";
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment", "http://geronimo.apache.org/xml/ns/deployment-1.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment-1.1", "http://geronimo.apache.org/xml/ns/deployment-1.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/deployment/javabean", "http://geronimo.apache.org/xml/ns/deployment/javabean-1.0");
+ }
+
private final Naming naming;
private final ConfigurationManager configurationManager;
private final NamespaceDrivenBuilderCollection serviceBuilders;
@@ -83,6 +93,18 @@
public ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection serviceBuilders, Naming naming) {
this(defaultEnvironment, repositories, serviceBuilders, naming, null);
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
private ServiceConfigBuilder(Environment defaultEnvironment, Collection repositories, Collection serviceBuilders, Naming naming, ConfigurationManager configurationManager) {
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Thu Jan 10 03:07:04 2008
@@ -59,6 +59,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.AppClientModule;
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.CorbaGBeanNameSource;
@@ -103,10 +104,16 @@
/**
* @version $Rev:385232 $ $Date$
*/
-public class AppClientModuleBuilder implements ModuleBuilder, CorbaGBeanNameSource {
+public class AppClientModuleBuilder implements ModuleBuilder, CorbaGBeanNameSource, GBeanLifecycle {
private static final Log log = LogFactory.getLog(AppClientModuleBuilder.class);
private static final String LINE_SEP = System.getProperty("line.separator");
private static final String GERAPPCLIENT_NAMESPACE = GerApplicationClientDocument.type.getDocumentElementName().getNamespaceURI();
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0");
+ }
private final Environment defaultClientEnvironment;
private final Environment defaultServerEnvironment;
@@ -200,6 +207,17 @@
this.clientArtifactResolver = clientArtifactResolver;
}
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
+ }
public AbstractNameQuery getCorbaGBeanName() {
return corbaGBeanObjectName;
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java Thu Jan 10 03:07:04 2008
@@ -40,7 +40,14 @@
private AppClientModuleBuilder builder;
protected void setUp() throws Exception {
+ super.setUp();
builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null, Collections.<Repository>emptyList(), null, null, null, Collections.<ModuleBuilderExtension>emptyList(), clientArtifactResolver);
+ builder.doStart();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ builder.doStop();
}
public void testResourceRef() throws Exception {
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan1.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan1.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan1.xml Thu Jan 10 03:07:04 2008
@@ -20,7 +20,7 @@
<!-- clientConfigId="test-client"
configId="client"
parentId="org/apache/geronimo/DefaultDatabase">-->
- <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
@@ -28,7 +28,7 @@
<dep:type>car</dep:type>
</dep:moduleId>
</dep:client-environment>
- <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testserver</dep:artifactId>
Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan2.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan2.xml (original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/resources/plans/plan2.xml Thu Jan 10 03:07:04 2008
@@ -20,7 +20,7 @@
<!-- clientConfigId="test-client"
configId="client"
parentId="org/apache/geronimo/DefaultDatabase">-->
- <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
@@ -28,7 +28,7 @@
<dep:type>car</dep:type>
</dep:moduleId>
</dep:client-environment>
- <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testserver</dep:artifactId>
@@ -41,13 +41,13 @@
<nam:resource-link>DefaultDatabase</nam:resource-link>
</nam:resource-ref>
<resource>
- <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <external-rar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:groupId>org.tranql</dep:groupId>
<dep:artifactId>tranql-connector-ra</dep:artifactId>
<dep:type>rar</dep:type>
</external-rar>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:artifactId>testclient</dep:artifactId>
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Thu Jan 10 03:07:04 2008
@@ -79,6 +79,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.InvalidConfigurationException;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -125,11 +126,17 @@
/**
* @version $Rev:385659 $ $Date$
*/
-public class ConnectorModuleBuilder implements ModuleBuilder, ActivationSpecInfoLocator {
+public class ConnectorModuleBuilder implements ModuleBuilder, ActivationSpecInfoLocator, GBeanLifecycle {
private final static Log log = LogFactory.getLog(ConnectorModuleBuilder.class);
+ private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter-version");
private static QName CONNECTOR_QNAME = GerConnectorDocument.type.getDocumentElementName();
static final String GERCONNECTOR_NAMESPACE = CONNECTOR_QNAME.getNamespaceURI();
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.1", "http://geronimo.apache.org/xml/ns/j2ee/connector-1.2");
+ }
private final int defaultMaxSize;
private final int defaultMinSize;
@@ -139,7 +146,6 @@
private final boolean defaultXAThreadCaching;
private final Environment defaultEnvironment;
private final NamespaceDrivenBuilderCollection serviceBuilders;
- private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter-version");
public ConnectorModuleBuilder(Environment defaultEnvironment,
int defaultMaxSize,
@@ -158,6 +164,18 @@
this.defaultXATransactionCaching = defaultXATransactionCaching;
this.defaultXAThreadCaching = defaultXAThreadCaching;
this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders, GBeanBuilder.SERVICE_QNAME);
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
Modified: geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/connector/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Thu Jan 10 03:07:04 2008
@@ -138,6 +138,7 @@
null,
kernel.getNaming(),
null);
+ configBuilder.doStart();
ConfigurationData configData = null;
DeploymentContext context = null;
ArtifactManager artifactManager = new DefaultArtifactManager();
@@ -161,8 +162,10 @@
DeploymentUtil.recursiveDelete(configData.getConfigurationDir());
}
}
+ configBuilder.doStop();
} finally {
DeploymentUtil.close(rarFile);
+
}
}
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba-builder/src/main/java/org/apache/geronimo/corba/deployment/CorbaModuleBuilderExtension.java Thu Jan 10 03:07:04 2008
@@ -28,12 +28,14 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.corba.TSSLinkGBean;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
@@ -59,8 +61,17 @@
/**
* @version $Rev$ $Date$
*/
-public class CorbaModuleBuilderExtension implements ModuleBuilderExtension {
- // our default environment
+public class CorbaModuleBuilderExtension implements ModuleBuilderExtension, GBeanLifecycle {
+
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-css-config_1_0", "http://openejb.apache.org/xml/ns/corba-css-config-2.1");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-css-config-2.0", "http://openejb.apache.org/xml/ns/corba-css-config-2.1");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config_1_0", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config-2.0", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/corba-tss-config-2.1", "http://openejb.apache.org/xml/ns/corba-tss-config-2.1");
+ }
+ // our default environment
protected Environment defaultEnvironment;
public CorbaModuleBuilderExtension() throws Exception {
@@ -69,6 +80,18 @@
public CorbaModuleBuilderExtension(Environment defaultEnvironment) {
this.defaultEnvironment = defaultEnvironment;
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
/**
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Thu Jan 10 03:07:04 2008
@@ -66,6 +66,7 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferencePatterns;
import org.apache.geronimo.gbean.SingleElementCollection;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.ApplicationInfo;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl;
@@ -102,12 +103,18 @@
/**
* @version $Rev$ $Date$
*/
-public class EARConfigBuilder implements ConfigurationBuilder, CorbaGBeanNameSource {
+public class EARConfigBuilder implements ConfigurationBuilder, CorbaGBeanNameSource, GBeanLifecycle {
private static final Log log = LogFactory.getLog(EARConfigBuilder.class);
private static final String LINE_SEP = System.getProperty("line.separator");
private final static QName APPLICATION_QNAME = GerApplicationDocument.type.getDocumentElementName();
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.1", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/application-1.2", "http://geronimo.apache.org/xml/ns/j2ee/application-2.0");
+ }
private final ConfigurationManager configurationManager;
private final Collection<? extends Repository> repositories;
@@ -249,6 +256,17 @@
this.artifactResolvers = artifactResolvers;
}
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
+ }
public AbstractNameQuery getCorbaGBeanName() {
return corbaGBeanObjectName;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-car.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-car.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-car.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-car.xml Thu Jan 10 03:07:04 2008
@@ -20,9 +20,9 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
@@ -37,6 +37,6 @@
</module>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
- <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
</application>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-ejb-jar.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-ejb-jar.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-ejb-jar.xml Thu Jan 10 03:07:04 2008
@@ -20,9 +20,9 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
@@ -37,6 +37,6 @@
</module>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
- <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
</application>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-rar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-rar.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-rar.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-rar.xml Thu Jan 10 03:07:04 2008
@@ -20,9 +20,9 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
@@ -37,6 +37,6 @@
</module>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
- <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
</application>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-war.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-war.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-war.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/resources/plans/test-bad-war.xml Thu Jan 10 03:07:04 2008
@@ -20,9 +20,9 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<moduleId>
<groupId>geronimo</groupId>
<artifactId>test-ear</artifactId>
@@ -37,6 +37,6 @@
</module>
<!-- a random gbean just to verify that the deployer doesn't die because of it -->
- <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
+ <gbean xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" name="foo" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
</application>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Thu Jan 10 03:07:04 2008
@@ -147,7 +147,7 @@
// URL expectedOutputXml = classLoader.getResource("geronimo/ejb-naming-post.xml");
XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
//this is not a usable type, we'll see what happens though
- xmlObject = SchemaConversionUtils.getNestedObjectAsType(xmlObject, new QName("http://www.openejb.org/xml/ns/openejb-jar-2.1", "openejb-jar"), EjbJarType.type);
+ xmlObject = SchemaConversionUtils.getNestedObjectAsType(xmlObject, new QName("http://openejb.apache.org/xml/ns/openejb-jar-2.3", "openejb-jar"), EjbJarType.type);
// log.debug(xmlObject.toString());
}
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml Thu Jan 10 03:07:04 2008
@@ -17,7 +17,7 @@
-->
<openejb-jar
- xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.3">
<environment>
<moduleId>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-pre.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-pre.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/src/test/resources/geronimo/web-md-pre.xml Thu Jan 10 03:07:04 2008
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java Thu Jan 10 03:07:04 2008
@@ -21,6 +21,7 @@
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+import java.util.HashMap;
import javax.annotation.Resource;
@@ -29,6 +30,7 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.annotation.AnnotatedApp;
import org.apache.geronimo.j2ee.deployment.annotation.ResourceAnnotationHelper;
@@ -40,20 +42,38 @@
import org.apache.geronimo.xbeans.javaee.InjectionTargetType;
import org.apache.geronimo.xbeans.javaee.JndiNameType;
import org.apache.geronimo.xbeans.javaee.XsdStringType;
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.xmlbeans.QNameSet;
import org.apache.xmlbeans.XmlObject;
/**
* @version $Rev$ $Date$
*/
-public class EnvironmentEntryBuilder extends AbstractNamingBuilder {
+public class EnvironmentEntryBuilder extends AbstractNamingBuilder implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(EnvironmentEntryBuilder.class);
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming", "http://geronimo.apache.org/xml/ns/naming-1.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/naming-1.1", "http://geronimo.apache.org/xml/ns/naming-1.2");
+ }
private final QNameSet envEntryQNameSet;
public EnvironmentEntryBuilder(String[] eeNamespaces) {
envEntryQNameSet = buildQNameSet(eeNamespaces, "env-entry");
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map componentContext) throws DeploymentException {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java Thu Jan 10 03:07:04 2008
@@ -37,6 +37,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -67,13 +68,35 @@
/**
* @version $Rev$ $Date$
*/
-public class GeronimoSecurityBuilderImpl implements NamespaceDrivenBuilder {
+public class GeronimoSecurityBuilderImpl implements NamespaceDrivenBuilder, GBeanLifecycle {
private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
private static final QNameSet SECURITY_QNAME_SET = QNameSet.singleton(SECURITY_QNAME);
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.1", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/loginconfig-1.2", "http://geronimo.apache.org/xml/ns/loginconfig-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security", "http://geronimo.apache.org/xml/ns/security-1.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.1", "http://geronimo.apache.org/xml/ns/security-2.0");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/security-1.2", "http://geronimo.apache.org/xml/ns/security-2.0");
+ }
+
private final AbstractNameQuery credentialStoreName;
public GeronimoSecurityBuilderImpl(AbstractNameQuery credentialStoreName) {
this.credentialStoreName = credentialStoreName;
+ }
+
+ public void doStart() {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
public void buildEnvironment(XmlObject container, Environment environment) throws DeploymentException {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/src/test/java/org/apache/geronimo/security/deployment/LoginConfigBuilderTest.java Thu Jan 10 03:07:04 2008
@@ -127,6 +127,8 @@
}
private void doTest(String text) throws XmlException, DeploymentException {
+ GeronimoSecurityBuilderImpl secBuilder = new GeronimoSecurityBuilderImpl(null);
+ secBuilder.doStart();
LoginConfigBuilder builder = new LoginConfigBuilder(new Jsr77Naming(), null);
XmlObject xmlObject = XmlBeansUtil.parse(text);
XmlCursor cursor = xmlObject.newCursor();
@@ -135,6 +137,7 @@
DeploymentContext context = new DeploymentContext(new File("."), null, new Environment(Artifact.create("test/foo/1.0/car")), null, ConfigurationModuleType.SERVICE, new Jsr77Naming(), new MockConfigurationManager(), Collections.emptySet());
AbstractName parentName = new AbstractName(URI.create("test/foo/1.0/car?name=parent,j2eeType=foo"));
builder.getReferences(xmlObject, context, parentName, getClass().getClassLoader());
+ secBuilder.doStop();
}
private static class MockConfigurationManager implements ConfigurationManager {
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre.xml Thu Jan 10 03:07:04 2008
@@ -16,8 +16,8 @@
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre2.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre2.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre2.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre2.xml Thu Jan 10 03:07:04 2008
@@ -16,8 +16,8 @@
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre3.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre3.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre3.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/tomcat-pre3.xml Thu Jan 10 03:07:04 2008
@@ -16,8 +16,8 @@
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/web">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/web-md-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/web-md-pre.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/web-md-pre.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/src/test/resources/plans/web-md-pre.xml Thu Jan 10 03:07:04 2008
@@ -16,9 +16,9 @@
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+ xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dep:environment>
<dep:moduleId>
<dep:groupId>geronimo</dep:groupId>
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/main/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilder.java Thu Jan 10 03:07:04 2008
@@ -55,6 +55,7 @@
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
@@ -119,8 +120,23 @@
/**
* @version $Rev:385659 $ $Date$
*/
-public class JettyModuleBuilder extends AbstractWebModuleBuilder {
+public class JettyModuleBuilder extends AbstractWebModuleBuilder implements GBeanLifecycle {
private final static Log log = LogFactory.getLog(JettyModuleBuilder.class);
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.1", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/jetty/config-1.0", "http://geronimo.apache.org/xml/ns/j2ee/web/jetty/config-1.0.1");
+ }
+
private final Environment defaultEnvironment;
private final AbstractNameQuery jettyContainerObjectName;
private final JettyJspServletHolder jspServlet;
@@ -171,6 +187,18 @@
this.defaultWelcomeFiles = defaultWelcomeFiles == null ? new ArrayList<String>() : defaultWelcomeFiles;
this.defaultLocaleEncodingMappings = defaultLocaleEncodingMappings == null ? new HashMap<String, String>() : defaultLocaleEncodingMappings;
this.defaultMimeTypeMappings = defaultMimeTypeMappings == null ? new HashMap<String, String>() : defaultMimeTypeMappings;
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
private static GBeanData getGBeanData(Kernel kernel, Object template) throws GBeanNotFoundException {
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/JettyModuleBuilderTest.java Thu Jan 10 03:07:04 2008
@@ -291,9 +291,11 @@
moduleBuilderExtensions,
new MockResourceEnvironmentSetter(),
kernel);
+ builder.doStart();
}
protected void tearDown() throws Exception {
+ builder.doStop();
kernel.shutdown();
super.tearDown();
}
Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/src/test/java/org/apache/geronimo/jetty6/deployment/PlanParsingTest.java Thu Jan 10 03:07:04 2008
@@ -71,7 +71,8 @@
private JettyModuleBuilder builder;
private AtomicBoolean isDefault = new AtomicBoolean(false);
- public PlanParsingTest() throws Exception {
+ protected void setUp() throws Exception {
+ super.setUp();
builder = new JettyModuleBuilder(defaultEnvironment,
new Integer(1800),
null,
@@ -90,6 +91,12 @@
null,
new MockResourceEnvironmentSetter(),
null);
+ builder.doStart();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ builder.doStop();
}
public void testContents() throws Exception {
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Thu Jan 10 03:07:04 2008
@@ -58,6 +58,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
@@ -135,10 +136,19 @@
*
* @version $Revision: 479481 $ $Date: 2006-11-26 16:52:20 -0800 (Sun, 26 Nov 2006) $
*/
-public class EjbModuleBuilder implements ModuleBuilder {
+public class EjbModuleBuilder implements ModuleBuilder, GBeanLifecycle {
private static final Log log = LogFactory.getLog(EjbModuleBuilder.class);
private static final String OPENEJBJAR_NAMESPACE = XmlUtil.OPENEJBJAR_QNAME.getNamespaceURI();
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.1", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.2", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/openejb-jar-2.3", "http://openejb.apache.org/xml/ns/openejb-jar-2.3");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/pkgen", "http://openejb.apache.org/xml/ns/pkgen-2.1");
+ NAMESPACE_UPDATES.put("http://www.openejb.org/xml/ns/pkgen-2.0", "http://openejb.apache.org/xml/ns/pkgen-2.1");
+ }
private final Environment defaultEnvironment;
private final String defaultCmpJTADataSource;
@@ -183,6 +193,18 @@
System.setProperty("openejb.naming", "xbean");
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
private void setDefaultProperty(String key, String value) {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Thu Jan 10 03:07:04 2008
@@ -50,6 +50,7 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.ReferencePatterns;
+import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
@@ -102,12 +103,24 @@
/**
* @version $Rev:385659 $ $Date$
*/
-public class TomcatModuleBuilder extends AbstractWebModuleBuilder {
+public class TomcatModuleBuilder extends AbstractWebModuleBuilder implements GBeanLifecycle {
private static final Log log = LogFactory.getLog(TomcatModuleBuilder.class);
private static final String TOMCAT_NAMESPACE = TomcatWebAppDocument.type.getDocumentElementName().getNamespaceURI();
private static final String IS_JAVAEE = "IS_JAVAEE";
+ private static final Map<String, String> NAMESPACE_UPDATES = new HashMap<String, String>();
+ static {
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1");
+ NAMESPACE_UPDATES.put("http://geronimo.apache.org/xml/ns/web/tomcat/config", "http://geronimo.apache.org/xml/ns/j2ee/web/tomcat/config-1.0");
+ }
private final Environment defaultEnvironment;
private final AbstractNameQuery tomcatContainerName;
@@ -127,6 +140,18 @@
this.defaultEnvironment = defaultEnvironment;
this.clusteringBuilders = new NamespaceDrivenBuilderCollection(clusteringBuilders, GerClusteringDocument.type.getDocumentElementName());
this.tomcatContainerName = tomcatContainerName;
+ }
+
+ public void doStart() throws Exception {
+ XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doStop() {
+ XmlBeansUtil.unregisterNamespaceUpdates(NAMESPACE_UPDATES);
+ }
+
+ public void doFail() {
+ doStop();
}
protected Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone, String contextRoot, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Thu Jan 10 03:07:04 2008
@@ -64,6 +64,11 @@
null,
new MockResourceEnvironmentSetter(),
null);
+ builder.doStart();
+ }
+
+ protected void tearDown() throws Exception {
+ builder.doStop();
}
public void testResourceRef() throws Exception {
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Thu Jan 10 03:07:04 2008
@@ -344,9 +344,11 @@
null,
new MockResourceEnvironmentSetter(),
null);
+ builder.doStart();
}
protected void tearDown() throws Exception {
+ builder.doStop();
kernel.shutdown();
super.tearDown();
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testBuiltGBeans.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testBuiltGBeans.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testBuiltGBeans.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testBuiltGBeans.xml Thu Jan 10 03:07:04 2008
@@ -18,7 +18,7 @@
<!-- $Rev: 602280 $ $Date: 2007-12-08 11:17:52 +1100 (Sat, 08 Dec 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
<environment>
<moduleId>
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testOverrideDefaults.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testOverrideDefaults.xml?rev=610760&r1=610759&r2=610760&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testOverrideDefaults.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/src/test/resources/org/apache/geronimo/tomcat/cluster/wadi/builder/WADITomcatClusteringBuilder_testOverrideDefaults.xml Thu Jan 10 03:07:04 2008
@@ -18,7 +18,7 @@
<!-- $Rev: 602280 $ $Date: 2007-12-08 11:17:52 +1100 (Sat, 08 Dec 2007) $ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1"
xmlns:clust-wadi="http://geronimo.apache.org/xml/ns/tomcat-clustering-wadi-1.2"
xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming-1.2">