You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/05/08 22:16:51 UTC
svn commit: r405150 [2/2] - in /geronimo/branches/1.1:
applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/
configs/activemq-broker/src/plan/ configs/axis-deployer/src/plan/
configs/axis/src/plan/ configs/client-cor...
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan3.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan3.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan3.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan3.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml Mon May 8 13:16:26 2006
@@ -3,12 +3,12 @@
xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>foo</dep:groupId>
<dep:artifactId>bar</dep:artifactId>
<dep:version>1</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<context-priority-classloader>true</context-priority-classloader>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test-resources/plans/plan4.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>true</context-priority-classloader>
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java Mon May 8 13:16:26 2006
@@ -124,7 +124,7 @@
private void addEnvironment(JettyWebAppType webApp) {
EnvironmentType environmentType = webApp.addNewEnvironment();
- ArtifactType configId = environmentType.addNewConfigId();
+ ArtifactType configId = environmentType.addNewModuleId();
configId.setGroupId("g");
configId.setArtifactId("a");
configId.setVersion("1");
Modified: geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/schema/geronimo-naming-1.1.xsd Mon May 8 13:16:26 2006
@@ -25,7 +25,7 @@
attributeFormDefault="unqualified"
version="1.0">
- <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xsd:annotation>
<xsd:documentation>
Modified: geronimo/branches/1.1/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/security-builder/src/schema/geronimo-login-config-1.1.xsd Mon May 8 13:16:26 2006
@@ -28,7 +28,7 @@
attributeFormDefault="unqualified"
version="1.0">
- <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xsd:element name="login-config" type="geronimo:login-configType"/>
Modified: geronimo/branches/1.1/modules/service-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/maven.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/maven.xml (original)
+++ geronimo/branches/1.1/modules/service-builder/maven.xml Mon May 8 13:16:26 2006
@@ -24,7 +24,7 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
- maven.xmlbeans2.sourceschema="schema/geronimo-config-1.1.xsd,schema/geronimo-javabean-xmlattribute-1.0.xsd"/>
+ maven.xmlbeans2.sourceschema="schema/geronimo-module-1.1.xsd,schema/geronimo-javabean-xmlattribute-1.0.xsd"/>
<mkdir dir="${basedir}/target/xmlbeans-classes"/>
<mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
<copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/EnvironmentBuilder.java Mon May 8 13:16:26 2006
@@ -53,8 +53,8 @@
public static Environment buildEnvironment(EnvironmentType environmentType) {
Environment environment = new Environment();
if (environmentType != null) {
- if (environmentType.isSetConfigId()) {
- environment.setConfigId(toArtifact(environmentType.getConfigId(), null));
+ if (environmentType.isSetModuleId()) {
+ environment.setConfigId(toArtifact(environmentType.getModuleId(), null));
}
if (environmentType.isSetDependencies()) {
@@ -97,7 +97,7 @@
EnvironmentType environmentType = EnvironmentType.Factory.newInstance();
if (environment.getConfigId() != null) {
ArtifactType configId = toArtifactType(environment.getConfigId());
- environmentType.setConfigId(configId);
+ environmentType.setModuleId(configId);
}
List dependencies = toArtifactTypes(environment.getDependencies());
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java Mon May 8 13:16:26 2006
@@ -37,8 +37,8 @@
import org.apache.geronimo.deployment.ModuleIDBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.xbeans.AttributeType;
-import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
-import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleType;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
import org.apache.geronimo.deployment.xbeans.PatternType;
@@ -82,7 +82,7 @@
private static final Map xmlReferenceBuilderMap = new HashMap();
private Map attrRefMap;
private Map refRefMap;
- private static final QName SERVICE_QNAME = ConfigurationDocument.type.getDocumentElementName();
+ private static final QName SERVICE_QNAME = ModuleDocument.type.getDocumentElementName();
private final Naming naming;
private final ConfigurationManager configurationManager;
@@ -159,34 +159,34 @@
} finally {
cursor.dispose();
}
- ConfigurationDocument configurationDoc;
- if (xmlObject instanceof ConfigurationDocument) {
- configurationDoc = (ConfigurationDocument) xmlObject;
+ ModuleDocument moduleDoc;
+ if (xmlObject instanceof ModuleDocument) {
+ moduleDoc = (ModuleDocument) xmlObject;
} else {
- configurationDoc = (ConfigurationDocument) xmlObject.changeType(ConfigurationDocument.type);
+ moduleDoc = (ModuleDocument) xmlObject.changeType(ModuleDocument.type);
}
Collection errors = new ArrayList();
- if (!configurationDoc.validate(XmlBeansUtil.createXmlOptions(errors))) {
- throw new DeploymentException("Invalid deployment descriptor: " + errors + "\nDescriptor: " + configurationDoc.toString());
+ if (!moduleDoc.validate(XmlBeansUtil.createXmlOptions(errors))) {
+ throw new DeploymentException("Invalid deployment descriptor: " + errors + "\nDescriptor: " + moduleDoc.toString());
}
// If there's no artifact ID and we won't be able to figure one out later, use the plan file name. Bit of a hack.
- if(jarFile == null && (configurationDoc.getConfiguration().getEnvironment() == null ||
- configurationDoc.getConfiguration().getEnvironment().getConfigId() == null ||
- configurationDoc.getConfiguration().getEnvironment().getConfigId().getArtifactId() == null)) {
- if(configurationDoc.getConfiguration().getEnvironment() == null) {
- configurationDoc.getConfiguration().addNewEnvironment();
+ if(jarFile == null && (moduleDoc.getModule().getEnvironment() == null ||
+ moduleDoc.getModule().getEnvironment().getModuleId() == null ||
+ moduleDoc.getModule().getEnvironment().getModuleId().getArtifactId() == null)) {
+ if(moduleDoc.getModule().getEnvironment() == null) {
+ moduleDoc.getModule().addNewEnvironment();
}
- if(configurationDoc.getConfiguration().getEnvironment().getConfigId() == null) {
- configurationDoc.getConfiguration().getEnvironment().addNewConfigId();
+ if(moduleDoc.getModule().getEnvironment().getModuleId() == null) {
+ moduleDoc.getModule().getEnvironment().addNewModuleId();
}
String name = planFile.getName();
int pos = name.lastIndexOf('.');
if(pos > -1) {
name = name.substring(0, pos);
}
- configurationDoc.getConfiguration().getEnvironment().getConfigId().setArtifactId(name);
+ moduleDoc.getModule().getEnvironment().getModuleId().setArtifactId(name);
}
- return configurationDoc.getConfiguration();
+ return moduleDoc.getModule();
} catch (XmlException e) {
throw new DeploymentException("Could not parse xml in plan", e);
} catch (IOException e) {
@@ -195,7 +195,7 @@
}
public Artifact getConfigurationID(Object plan, JarFile module, ModuleIDBuilder idBuilder) throws IOException, DeploymentException {
- ConfigurationType configType = (ConfigurationType) plan;
+ ModuleType configType = (ModuleType) plan;
EnvironmentType environmentType = configType.getEnvironment();
Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
idBuilder.resolve(environment, module == null ? "" : new File(module.getName()).getName(), "car");
@@ -206,18 +206,18 @@
}
public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, Object plan, JarFile jar, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws IOException, DeploymentException {
- ConfigurationType configType = (ConfigurationType) plan;
+ ModuleType configType = (ModuleType) plan;
return buildConfiguration(inPlaceDeployment, configId, configType, jar, configurationStores, artifactResolver, targetConfigurationStore);
}
- public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, ConfigurationType configurationType, JarFile jar, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws DeploymentException, IOException {
- ArtifactType type = configurationType.getEnvironment().isSetConfigId() ? configurationType.getEnvironment().getConfigId() : configurationType.getEnvironment().addNewConfigId();
+ public DeploymentContext buildConfiguration(boolean inPlaceDeployment, Artifact configId, ModuleType moduleType, JarFile jar, Collection configurationStores, ArtifactResolver artifactResolver, ConfigurationStore targetConfigurationStore) throws DeploymentException, IOException {
+ ArtifactType type = moduleType.getEnvironment().isSetModuleId() ? moduleType.getEnvironment().getModuleId() : moduleType.getEnvironment().addNewModuleId();
type.setArtifactId(configId.getArtifactId());
type.setGroupId(configId.getGroupId());
type.setType(configId.getType());
type.setVersion(configId.getVersion().toString());
- Environment environment = EnvironmentBuilder.buildEnvironment(configurationType.getEnvironment(), defaultEnvironment);
+ Environment environment = EnvironmentBuilder.buildEnvironment(moduleType.getEnvironment(), defaultEnvironment);
if(!environment.getConfigId().isResolved()) {
throw new IllegalStateException("Module ID should be fully resolved by now (not "+environment.getConfigId()+")");
}
@@ -249,7 +249,7 @@
AbstractName moduleName = naming.createRootName(configId, configId.toString(), NameFactory.SERVICE_MODULE);
- GbeanType[] gbeans = configurationType.getGbeanArray();
+ GbeanType[] gbeans = moduleType.getGbeanArray();
addGBeans(gbeans, cl, moduleName, context);
return context;
Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java Mon May 8 13:16:26 2006
@@ -52,8 +52,8 @@
public void configure(EnvironmentType env) {
setXmlObject(env);
- if(env.isSetConfigId()) {
- configId = new Artifact(env.getConfigId());
+ if(env.isSetModuleId()) {
+ configId = new Artifact(env.getModuleId());
}
if(env.isSetDependencies()) {
DependenciesType deps = env.getDependencies();
@@ -77,10 +77,10 @@
return;
}
if(old != null) {
- getEnvironmentType().unsetConfigId();
+ getEnvironmentType().unsetModuleId();
}
if(configId != null) {
- configId.configure(getEnvironmentType().addNewConfigId());
+ configId.configure(getEnvironmentType().addNewModuleId());
}
pcs.firePropertyChange("configId", old, configId);
}
Added: geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd?rev=405150&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd (added)
+++ geronimo/branches/1.1/modules/service-builder/src/schema/geronimo-module-1.1.xsd Mon May 8 13:16:26 2006
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xs:schema
+ targetNamespace="http://geronimo.apache.org/xml/ns/deployment-1.1"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ >
+ <xs:annotation>
+ <xs:documentation>
+ Schema for Geronimo Services deployment plans.
+ Instance documents should begin with the element:
+
+ >gbeans xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"<
+ </xs:documentation>
+ </xs:annotation>
+
+ <xs:element name="module" type="sys:moduleType"/>
+
+ <xs:complexType name="moduleType">
+ <xs:sequence>
+ <xs:element ref="sys:environment"/>
+ <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:element name="environment" type="sys:environmentType">
+<!-- TODO figure out why this doesn't work
+ <xs:key name="name-key-key">
+ <xs:annotation>
+ <xs:documentation>
+ name-key-key assures that key-values for the names of services in this module will
+ have unique key names.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:selector xpath="sys:name-key"/>
+ <xs:field xpath="sys:name-key/key"/>
+ </xs:key>
+-->
+ </xs:element>
+ <xs:element name="client-environment" type="sys:environmentType">
+<!--
+ <xs:annotation>
+ <xs:documentation>
+ TODO document me - am I only used by the app client builder?
+ </xs:documentation>
+ </xs:annotation>
+-->
+ </xs:element>
+
+ <xs:element name="server-environment" type="sys:environmentType">
+<!--
+ <xs:annotation>
+ <xs:documentation>
+ TODO document me - am I only used by the app client builder?
+ </xs:documentation>
+ </xs:annotation>
+-->
+ </xs:element>
+
+ <xs:complexType name="environmentType">
+ <xs:sequence>
+ <xs:element name="moduleId" type="sys:artifactType" minOccurs="0" >
+ <xs:annotation>
+ <xs:documentation>
+ "moduleId" holds elements for the groupId, artifactId, and version of the module
+ version can be ommitted in which case a timestamp is used.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="dependencies" type="sys:dependenciesType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ "dependences" holds all classloader and dependency information for the module
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="hidden-classes" type="sys:classFilterType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ A list of classes which will never be loaded from parent ClassLoaders of this
+ module. For example, if Log4J was listed here, the module would never see
+ Geronimo's copy of Log4J. If the module provided it's own Log4J JAR it would
+ use that, otherwise it would not be able to load Log4J at all.
+
+ The classes are specified in zero or more child "filter" elements
+ where each filter element specifies a fully-qualified class name or
+ prefix. Essentially, any class that starts with one of the prefixes listed
+ here will be treated as hidden. For example, if you specify two filter elements
+ containing "java.util" and "java.lang" then you would really screw up your application. :)
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="non-overridable-classes" type="sys:classFilterType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ A list of classes which will only be loaded from parent ClassLoaders of this
+ module (never from the module's own ClassLoader). For example, this is used
+ to prevent a web application from redefining "javax.servlet", so those
+ classes will *always* be loaded from the server instead of from the web
+ web application's own ClassPath.
+
+ The classes are specified in zero or more child "filter" elements
+ where each filter element specifies a fully-qualified class name or
+ prefix. Essentially, any class that starts with one of the prefixes listed
+ here will be treated as hidden. For example, specifying two filter elements
+ containing "javax.servlet" and "javax.ejb" would protect some of the core
+ J2EE classes from being overridden.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="inverse-classloading" type="sys:emptyType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ If the "inverse-classloading" element is specified, the standard
+ class loading delegation model is to be reversed for this module.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="suppress-default-environment" type="sys:emptyType" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ If the "suppress-default-environment" element is specified then any
+ default environment build by a builder when deploying the plan will
+ be suppressed.
+
+ An example of where this is useful is when deploying a connector on an app
+ client in a separate (standalone) module (not as part of a client plan).
+
+ The connector builder defaultEnvironment includes some server modules
+ that won't work on an app client, so you need to suppress the default
+ environment and supply a complete environment including all parents for a
+ non-app-client module you want to run on an app client
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="dependenciesType">
+ <xs:sequence>
+ <xs:element name="dependency" type="sys:artifactType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ "dependency" holds an artifact locating an artifact in a repository.
+ Depending on the type of artifact and value of the import element, the artifact may be
+ included in the current classpath, be loaded as a parent, may require the services
+ in the artifact to be started, or may not be added to the classpath.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="emptyType"/>
+
+ <xs:element name="gbean" type="sys:gbeanType">
+ <xs:annotation>
+ <xs:documentation>
+ Adds a new custom component to the server. The component will be deployed
+ when this application module is deployed, but it is not in any way protected,
+ so once it is up and running, other modules can refer to it normally.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+
+ <xs:complexType name="classFilterType">
+ <xs:sequence>
+ <xs:element name="filter" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ A fully-qualified class name or prefix to be filtered.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="artifactType">
+ <xs:annotation>
+ <xs:documentation><![CDATA[
+ Refers to either another module running in the server, or
+ an entry in the server's Repository. In either case this effectively uses a
+ URI.
+
+ When this is pointing to a repository entry, the URI must have a form
+ acceptable to the repository, which is currently a URI consisting of
+ Maven-style identifiers separated by slashes (groupId/artifactId/version/type,
+ for example, the URI "postgresql/postgresql-8.0-jdbc/313/jar" for a file like
+ "repository/postgresql/postgresql-8.0-jdbc-313.jar").
+
+ When this is pointing to a module, the URI should match the
+ module's moduleId. This also looks
+ like a Maven-style URI discussed above.
+
+ The artifactType element can take either a straight URI (as in the examples
+ above), or maven-style identifier fragments (groupId, type, artifactId, and
+ version), which it will compose into a URI by adding up the fragments with
+ slashes in between.
+
+ There is a correspondence between the xml format and a URI. For example, the URI
+
+ postgresql/postgresql-8.0-jdbc/313/jar
+
+ corresponds to the xml:
+
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql-8.0-jdbc</artifactId>
+ <version>313</version>
+ <type>jar</type>
+
+ ]]></xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <!-- TODO not sure if groupId can in fact be optional -->
+ <xs:element name="groupId" type="xs:string" minOccurs="0"/>
+ <xs:element name="artifactId" type="xs:string"/>
+ <xs:element name="version" type="xs:string" minOccurs="0"/>
+ <xs:element name="type" type="xs:string" minOccurs="0"/>
+ <xs:element name="import" type="sys:importType" minOccurs="0"/>
+
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="importType">
+ <xs:annotation>
+ <xs:documentation><![CDATA[
+ The import element is restrictive. The default (when omitted) is to include the specified dependency in
+ the classloader (as a parent or URL) and (if the dependency is a module) make sure it is started
+ before starting the current module. Specifying "classes" means that the classes must be included
+ in the current module's classloader but the dependency does not need to be started. (I'm not sure this
+ is actually possible, but it is what is meant). Specifying "services" means that the dependency (a module)
+ must be started before the current module, but it is not included as a parent classloader.
+
+ You probably never need to use the import element.
+
+ ]]></xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="classes"/>
+ <xs:enumeration value="services"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="gbeanType">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="attribute" type="sys:attributeType"/>
+ <xs:element name="xml-attribute" type="sys:xml-attributeType"/>
+ <xs:element name="reference" type="sys:referenceType"/>
+ <xs:element name="references" type="sys:referencesType"/>
+ <xs:element name="xml-reference" type="sys:xml-attributeType"/>
+ <xs:element name="dependency" type="sys:patternType"/>
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="class" type="xs:string" use="required"/>
+ </xs:complexType>
+
+ <xs:complexType name="attributeType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="xml-attributeType">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="referencesType">
+ <xs:sequence>
+ <xs:element name="pattern" type="sys:patternType" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="patternType">
+ <xs:annotation>
+ <xs:documentation>This group contains the components of an abstract name</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:sequence>
+ <xs:element name="groupId" type="xs:string" minOccurs="0"/>
+ <xs:element name="artifactId" type="xs:string" minOccurs="0"/>
+ <xs:element name="version" type="xs:string" minOccurs="0"/>
+ <xs:element name="module" type="xs:string" minOccurs="0"/>
+ <xs:element name="type" type="xs:string" minOccurs="0"/>
+ <xs:element name="name" type="xs:string" minOccurs="0"/>
+ </xs:sequence>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="referenceType">
+ <xs:complexContent>
+ <xs:extension base="sys:patternType">
+ <xs:attribute name="name" type="xs:string"/>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:element name="service" type="sys:serviceType"/>
+
+ <xs:complexType name="serviceType">
+ <xs:sequence>
+ <xs:element name="dependency" type="sys:artifactType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
Modified: geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml (original)
+++ geronimo/branches/1.1/modules/service-builder/src/test-resources/services/plan1.xml Mon May 8 13:16:26 2006
@@ -17,17 +17,17 @@
-->
-<configuration
+<module
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
>
<environment>
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>foo4</artifactId>
<version>DEV</version>
<type>car</type>
- </configId>
+ </moduleId>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
@@ -75,4 +75,4 @@
<name>MyMockGMBean</name>
</reference>
</gbean>
-</configuration>
+</module>
Modified: geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java Mon May 8 13:16:26 2006
@@ -20,8 +20,8 @@
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.FooBarBean;
import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
-import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
@@ -77,8 +77,8 @@
new ServiceConfigBuilder(parentEnvironment, null, referenceCollection, null, naming);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
final URL plan1 = cl.getResource("services/plan1.xml");
- ConfigurationDocument doc = ConfigurationDocument.Factory.parse(plan1);
- ConfigurationType plan = doc.getConfiguration();
+ ModuleDocument doc = ModuleDocument.Factory.parse(plan1);
+ ModuleType plan = doc.getModule();
File outFile = File.createTempFile("foo", "bar");
outFile.delete();
if (!outFile.mkdirs()) {
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/schema/geronimo-tomcat-1.1.xsd Mon May 8 13:16:26 2006
@@ -29,7 +29,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:element name="web-app" type="tomcat:web-appType"/>
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war-spaces-in-context/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -6,10 +6,10 @@
xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
>
<environment>
- <configId>
+ <moduleId>
<groupId>contextRootTest</groupId>
<artifactId>spacesInContext</artifactId>
- </configId>
+ </moduleId>
</environment>
<context-root>
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml Mon May 8 13:16:26 2006
@@ -19,12 +19,12 @@
xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-root>/test</context-root>
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test-resources/plans/plan1.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>foo</groupId>
<artifactId>bar</artifactId>
<version>1</version>
<type>car</type>
- </configId>
+ </moduleId>
</environment>
<context-priority-classloader>false</context-priority-classloader>
<security-realm-name>public-properties-realm</security-realm-name>
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Mon May 8 13:16:26 2006
@@ -50,7 +50,7 @@
GerWebAppDocument tomcatWebAppDoc = GerWebAppDocument.Factory.newInstance();
GerWebAppType tomcatWebAppType = tomcatWebAppDoc.addNewWebApp();
EnvironmentType environmentType = tomcatWebAppType.addNewEnvironment();
- ArtifactType artifactType = environmentType.addNewConfigId();
+ ArtifactType artifactType = environmentType.addNewModuleId();
artifactType.setArtifactId("foo");
tomcatWebAppType.setContextPriorityClassloader(false);
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml Mon May 8 13:16:26 2006
@@ -1,11 +1,11 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>appclient_dep</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -33,12 +33,12 @@
<java>appclient_dep_resref_single_client.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>appclient_dep_appclient_dep_client</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -75,12 +75,12 @@
<dep:non-overridable-classes/>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>bar</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
@@ -101,12 +101,12 @@
<external-rar>activemq/activemq-ra/${activemq_version}/rar</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">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>org.codehaus.activemq.ra_default</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_ejb_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_ejb_1_result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_ejb_1_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_ejb_1_result.xml Mon May 8 13:16:26 2006
@@ -1,11 +1,11 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>appclient_ejb_1</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -21,12 +21,12 @@
<ejb>appclient_ejb_1_ejb.jar</ejb>
<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>ejb</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
@@ -58,12 +58,12 @@
<java>appclient_ejb_1_client.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>appclient_ejb_1_appclient_ejb_1_client</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -76,12 +76,12 @@
<dep:non-overridable-classes/>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>bar</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/assembly_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/assembly_1_result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/assembly_1_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/assembly_1_result.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>assembly_1</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -22,12 +22,12 @@
<java>assembly_compat_standalone_jar_compat12_13_client.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>assembly_1_assembly_1_client</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -40,12 +40,12 @@
<dep:non-overridable-classes/>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>bar</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>transport_1</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -22,12 +22,12 @@
<java>transport_1_client.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
<dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>transport_ejb_vehicle_transport_ejb_vehicle_client</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
@@ -40,12 +40,12 @@
<dep:non-overridable-classes/>
</dep:client-environment>
<dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>bar</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies/>
<dep:hidden-classes/>
<dep:non-overridable-classes/>
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>default</dep:groupId>
<dep:artifactId>transport_jsp_vehicle</dep:artifactId>
<dep:version>1-default</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>${pom.groupId}</dep:groupId>
Modified: geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java (original)
+++ geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java Mon May 8 13:16:26 2006
@@ -19,7 +19,7 @@
import javax.xml.namespace.QName;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
+import org.apache.geronimo.deployment.xbeans.ModuleDocument;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.xbeans.geronimo.security.GerSecurityDocument;
import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
@@ -37,7 +37,7 @@
private static final QName GENERIC_CONFIG_QNAME = new QName(GENERIC_NAMESPACE, "container-config");
private static final QName OLD_GENERIC_CONFIG_QNAME = new QName(OLD_GENERIC_NAMESPACE, "container-config");
- private static final String SYSTEM_NAMESPACE = ConfigurationDocument.type.getDocumentElementName().getNamespaceURI();
+ private static final String SYSTEM_NAMESPACE = ModuleDocument.type.getDocumentElementName().getNamespaceURI();
private static final QName SECURITY_QNAME = GerSecurityDocument.type.getDocumentElementName();
private final String configNamespace;
private final String namespace;
Modified: geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/web-builder/src/schema/geronimo-web-1.1.xsd Mon May 8 13:16:26 2006
@@ -29,7 +29,7 @@
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-config-1.1.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
<xs:element name="web-app" type="web:web-appType"/>
Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<xml-fragment xmlns:tom="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1" xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<tom:context-priority-classloader>false</tom:context-priority-classloader>
Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<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">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<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">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
<container-config>
Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml Mon May 8 13:16:26 2006
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<web-app xmlns="http://geronimo.apache.org/xml/ns/web">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>test</dep:groupId>
<dep:type>car</dep:type>
<dep:artifactId>testclient</dep:artifactId>
<dep:version>1</dep:version>
- </dep:configId>
+ </dep:moduleId>
</dep:environment>
<context-priority-classloader>false</context-priority-classloader>
<container-config>
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/plan.xml Mon May 8 13:16:26 2006
@@ -15,12 +15,12 @@
<!--$Rev: 388890 $ $Date: 2006-03-26 01:00:55 -0800 (Sun, 26 Mar 2006) $-->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
<environment>
- <configId>
+ <moduleId>
<groupId>geronimo</groupId>
<artifactId>system-database</artifactId>
<version>1.1-SNAPSHOT</version>
<type>car</type>
- </configId>
+ </moduleId>
<dependencies>
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml?rev=405150&r1=405149&r2=405150&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/test-resources/result.xml Mon May 8 13:16:26 2006
@@ -14,12 +14,12 @@
<!--$Rev: 388890 $ $Date: 2006-03-26 01:00:55 -0800 (Sun, 26 Mar 2006) $-->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:environment>
- <dep:configId>
+ <dep:moduleId>
<dep:groupId>geronimo</dep:groupId>
<dep:artifactId>system-database</dep:artifactId>
<dep:version>1.1-SNAPSHOT</dep:version>
<dep:type>car</dep:type>
- </dep:configId>
+ </dep:moduleId>
<dep:dependencies>
<dep:dependency>
<dep:groupId>geronimo</dep:groupId>