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 2011/04/27 01:16:58 UTC
svn commit: r1096950 [4/4] - in /geronimo/server/trunk: ./
framework/buildsupport/car-maven-plugin/
framework/buildsupport/car-maven-plugin/src/main/filtered-resources/resources/etc/
framework/buildsupport/car-maven-plugin/src/main/java/org/apache/gero...
Added: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java?rev=1096950&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java Tue Apr 26 23:16:56 2011
@@ -0,0 +1,104 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.03.23 at 08:34:08 PM PDT
+//
+
+
+package org.apache.geronimo.deployment.service.plan;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for referencesType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="referencesType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="pattern" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}patternType" maxOccurs="unbounded"/>
+ * </sequence>
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "referencesType", propOrder = {
+ "pattern"
+})
+public class ReferencesType {
+
+ @XmlElement(required = true)
+ protected List<PatternType> pattern;
+ @XmlAttribute
+ protected String name;
+
+ /**
+ * Gets the value of the pattern property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the pattern property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getPattern().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link PatternType }
+ *
+ *
+ */
+ public List<PatternType> getPattern() {
+ if (pattern == null) {
+ pattern = new ArrayList<PatternType>();
+ }
+ return this.pattern;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/ReferencesType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java?rev=1096950&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java Tue Apr 26 23:16:56 2011
@@ -0,0 +1,100 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.03.23 at 08:34:08 PM PDT
+//
+
+
+package org.apache.geronimo.deployment.service.plan;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for xml-attributeType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="xml-attributeType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <any processContents='lax'/>
+ * </sequence>
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "xml-attributeType", propOrder = {
+ "any"
+})
+public class XmlAttributeType {
+
+ @XmlAnyElement(lax = true)
+ protected Object any;
+ @XmlAttribute
+ protected String name;
+
+ /**
+ * Gets the value of the any property.
+ *
+ * @return
+ * possible object is
+ * {@link Element }
+ * {@link Object }
+ *
+ */
+ public Object getAny() {
+ return any;
+ }
+
+ /**
+ * Sets the value of the any property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Element }
+ * {@link Object }
+ *
+ */
+ public void setAny(Object value) {
+ this.any = value;
+ }
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/XmlAttributeType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java?rev=1096950&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java Tue Apr 26 23:16:56 2011
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.03.23 at 08:34:08 PM PDT
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.deployment.service.plan;
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/service/plan/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd Tue Apr 26 23:16:56 2011
@@ -18,7 +18,10 @@
<xs:schema targetNamespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
+ jxb:version="1.0"
+ elementFormDefault="qualified"
attributeFormDefault="unqualified">
<xs:annotation>
@@ -77,7 +80,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element ref="sys:service" minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
Reference to service element defined later in this xsd.
@@ -151,15 +154,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="dependencies" type="sys:dependenciesType"
- minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- "dependencies" holds all classloader and dependency
- information for the module
- </xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="bundle-activator" type="xs:string" minOccurs="0"/>
<xs:element name="bundle-classPath" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="import-package" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -167,135 +161,26 @@
<xs:element name="require-bundle" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="dynamic-import-package" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
- <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="private-classes"
- type="sys:classFilterType" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- A list of classes which will only be loaded from the
- ClassLoader of this module or from parent ClassLoaders.
-
- This is used to prevent children configurations to see
- specific classes from its parents. The same effect can
- be achieved by using hidden-classes. However,
- private-classes is the preferred approach to hide
- specific classes from all children configurations.
- </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:element name="dependencies" type="sys:dependenciesType" />
-
- <xs:complexType name="dependenciesType">
- <xs:sequence>
- <xs:element name="dependency" type="sys:dependencyType"
- 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="service" type="sys:abstract-serviceType">
- <xs:annotation>
- <xs:documentation>
- An empty generic element to be extended by gbean and other
- module types.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
+ <!--<xs:element name="service" type="sys:abstract-serviceType">-->
+ <!--<xs:annotation>-->
+ <!--<xs:documentation>-->
+ <!--An empty generic element to be extended by gbean and other-->
+ <!--module types.-->
+ <!--</xs:documentation>-->
+ <!--</xs:annotation>-->
+ <!--</xs:element>-->
- <xs:complexType name="abstract-serviceType" abstract="true">
- <xs:sequence></xs:sequence>
- </xs:complexType>
+ <!--<xs:complexType name="abstract-serviceType" abstract="true">-->
+ <!--<xs:sequence></xs:sequence>-->
+ <!--</xs:complexType>-->
- <xs:element name="gbean" type="sys:gbeanType"
- substitutionGroup="sys:service">
+ <xs:element name="gbean" type="sys:gbeanType">
+ <!--substitutionGroup="sys:service">-->
<xs:annotation>
<xs:documentation>
Adds a new custom component to the server. The component will be
@@ -306,18 +191,18 @@
</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="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>
@@ -400,80 +285,80 @@
</xs:sequence>
</xs:complexType>
- <xs:complexType name="dependencyType">
- <xs:complexContent>
- <xs:extension base="sys:artifactType">
- <xs:annotation>
- <xs:documentation>
- DependencyType includes all the elements defined in
- artifactType.
- </xs:documentation>
- </xs:annotation>
- <xs:sequence>
- <xs:element name="import" type="sys:importType"
- minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- The import element is restrictive element to
- defined type of dependency. The default (when
- omitted) is to include the specified dependency
- in the classloader (as a parent or URL). If
- defined as "classes" means that the classes must
- be included in the current module's classloader
- but the dependency does not need to be started.
- Specifying "services" means that the dependency
- (a module) must be started before the current
- module, but it is not included as a parent
- classloader.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
-
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <!--<xs:complexType name="dependencyType">-->
+ <!--<xs:complexContent>-->
+ <!--<xs:extension base="sys:artifactType">-->
+ <!--<xs:annotation>-->
+ <!--<xs:documentation>-->
+ <!--DependencyType includes all the elements defined in-->
+ <!--artifactType.-->
+ <!--</xs:documentation>-->
+ <!--</xs:annotation>-->
+ <!--<xs:sequence>-->
+ <!--<xs:element name="import" type="sys:importType"-->
+ <!--minOccurs="0">-->
+ <!--<xs:annotation>-->
+ <!--<xs:documentation>-->
+ <!--The import element is restrictive element to-->
+ <!--defined type of dependency. The default (when-->
+ <!--omitted) is to include the specified dependency-->
+ <!--in the classloader (as a parent or URL). If-->
+ <!--defined as "classes" means that the classes must-->
+ <!--be included in the current module's classloader-->
+ <!--but the dependency does not need to be started.-->
+ <!--Specifying "services" means that the dependency-->
+ <!--(a module) must be started before the current-->
+ <!--module, but it is not included as a parent-->
+ <!--classloader.-->
+ <!--</xs:documentation>-->
+ <!--</xs:annotation>-->
+ <!--</xs:element>-->
+ <!--</xs:sequence>-->
- <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.
+ <!--</xs:extension>-->
+ <!--</xs:complexContent>-->
+ <!--</xs:complexType>-->
- You probably never need to use the import element.
- ]]>
- </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:enumeration value="classes">
- <xs:annotation>
- <xs:documentation>
- The value "classes" means that the classes must be
- included in the current module's classloader but the
- dependency does not need to be started.
- </xs:documentation>
- </xs:annotation>
- </xs:enumeration>
- <xs:enumeration value="services">
- <xs:annotation>
- <xs:documentation>
- The value "services" means that the dependency (a
- module) must be started before the current module, but
- it is not included as a parent classloader.
- </xs:documentation>
- </xs:annotation>
- </xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
+ <!--<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:annotation>-->
+ <!--<xs:documentation>-->
+ <!--The value "classes" means that the classes must be-->
+ <!--included in the current module's classloader but the-->
+ <!--dependency does not need to be started.-->
+ <!--</xs:documentation>-->
+ <!--</xs:annotation>-->
+ <!--</xs:enumeration>-->
+ <!--<xs:enumeration value="services">-->
+ <!--<xs:annotation>-->
+ <!--<xs:documentation>-->
+ <!--The value "services" means that the dependency (a-->
+ <!--module) must be started before the current module, but-->
+ <!--it is not included as a parent classloader.-->
+ <!--</xs:documentation>-->
+ <!--</xs:annotation>-->
+ <!--</xs:enumeration>-->
+ <!--</xs:restriction>-->
+ <!--</xs:simpleType>-->
<xs:complexType name="gbeanType">
- <xs:complexContent>
- <xs:extension base="sys:abstract-serviceType">
+ <!--<xs:complexContent>-->
+ <!--<xs:extension base="sys:abstract-serviceType">-->
<xs:annotation>
<xs:documentation>
gbeanType includes all the elements defined in
@@ -481,8 +366,9 @@
</xs:documentation>
</xs:annotation>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="attribute" type="sys:attributeType">
+ <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+ <xs:sequence>
+ <xs:element name="attribute" type="sys:attributeType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The attribute provide the name-value pair of
@@ -493,7 +379,7 @@
</xs:annotation>
</xs:element>
<xs:element name="xml-attribute"
- type="sys:xml-attributeType">
+ type="sys:xml-attributeType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The xml-attribute specifies the value of
@@ -504,7 +390,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="reference" type="sys:referenceType">
+ <xs:element name="reference" type="sys:referenceType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The "reference" element specifies the value of a
@@ -516,7 +402,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="references" type="sys:referencesType">
+ <xs:element name="references" type="sys:referencesType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The "references" element specifies the value of
@@ -526,7 +412,7 @@
</xs:annotation>
</xs:element>
<xs:element name="xml-reference"
- type="sys:xml-attributeType">
+ type="sys:xml-attributeType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The xml-reference specifies the value of
@@ -537,7 +423,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="dependency" type="sys:patternType">
+ <xs:element name="dependency" type="sys:patternType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
The element "dependency" is used to resolve
@@ -548,7 +434,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:choice>
+ </xs:sequence>
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
@@ -567,8 +453,8 @@
</xs:documentation>
</xs:annotation>
</xs:attribute>
- </xs:extension>
- </xs:complexContent>
+ <!--</xs:extension>-->
+ <!--</xs:complexContent>-->
</xs:complexType>
<xs:complexType name="attributeType">
@@ -704,6 +590,16 @@
</xs:annotation>
<xs:attribute name="name" type="xs:string">
<xs:annotation>
+ <xs:appinfo>
+ <!--<jxb:property version="1.0" name="refName"/>-->
+ <jxb:bindings node="//xs:complexType[@name='referenceType']">
+ <jxb:bindings node=".//xs:attribute[@name='name']">
+ <!--<jxb:bindings version="1.0">-->
+ <jxb:property name="refName"/>
+ </jxb:bindings>
+ </jxb:bindings>
+
+ </xs:appinfo>
<xs:documentation>
The name for the current reference. This name should
be same as specified in GBeanInfo for this GBean.
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/DummyJavaBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/DummyJavaBean.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/DummyJavaBean.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/DummyJavaBean.java Tue Apr 26 23:16:56 2011
@@ -27,7 +27,7 @@ public class DummyJavaBean {
private String encryptOnPersist;
private String string;
private boolean booleanValue;
- private char charValue;
+ private char charValue =' ';
private byte byteValue;
private short shortValue;
private int intValue;
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/EnvironmentBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/EnvironmentBuilderTest.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/EnvironmentBuilderTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/EnvironmentBuilderTest.java Tue Apr 26 23:16:56 2011
@@ -21,7 +21,8 @@ import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
import junit.framework.TestCase;
-import org.apache.geronimo.deployment.xbeans.ArtifactType;
+import org.apache.geronimo.deployment.service.plan.ArtifactType;
+import org.apache.geronimo.deployment.service.plan.ObjectFactory;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.gbean.GBeanData;
@@ -37,7 +38,7 @@ public class EnvironmentBuilderTest exte
}
public void testImportParent1() throws Exception {
- ArtifactType anImport = ArtifactType.Factory.newInstance();
+ ArtifactType anImport = new ObjectFactory().createArtifactType();
anImport.setGroupId("groupId");
anImport.setType("type");
anImport.setArtifactId("artifactId");
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeEditorTest.java Tue Apr 26 23:16:56 2011
@@ -19,13 +19,17 @@
package org.apache.geronimo.deployment.service;
+import java.io.StringReader;
import java.util.HashMap;
+import java.util.List;
-import org.apache.geronimo.deployment.javabean.xbeans.BeanPropertyType;
-import org.apache.geronimo.deployment.javabean.xbeans.JavabeanType;
-import org.apache.geronimo.deployment.javabean.xbeans.PropertyType;
import org.apache.geronimo.crypto.Encryption;
import org.apache.geronimo.crypto.EncryptionManager;
+import org.apache.geronimo.deployment.service.plan.BeanPropertyType;
+import org.apache.geronimo.deployment.service.plan.JavabeanType;
+import org.apache.geronimo.deployment.service.plan.JaxbUtil;
+import org.apache.geronimo.deployment.service.plan.ObjectFactory;
+import org.apache.geronimo.deployment.service.plan.PropertyType;
import org.apache.geronimo.kernel.osgi.MockBundleContext;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.config.ConfigurationData;
@@ -62,7 +66,7 @@ public class JavaBeanXmlAttributeEditorT
editor.setValue(bean);
String result = editor.getAsText();
- JavabeanType javabeanType = JavabeanType.Factory.parse(result);
+ JavabeanType javabeanType = new ObjectFactory().createJavabeanType();
assertPrimitive(javabeanType, "booleanValue", "true");
assertPrimitive(javabeanType, "byteValue", "1");
assertPrimitive(javabeanType, "charValue", "a");
@@ -75,9 +79,9 @@ public class JavaBeanXmlAttributeEditorT
}
private void assertPrimitive(JavabeanType javabeanType, String propertyName, String value) {
- for (PropertyType propertyType : javabeanType.getPropertyArray()) {
+ for (PropertyType propertyType : javabeanType.getProperty()) {
if (propertyType.getName().equals(propertyName)) {
- assertEquals(value, propertyType.getStringValue());
+ assertEquals(value, propertyType.getValue());
}
}
}
@@ -85,7 +89,7 @@ public class JavaBeanXmlAttributeEditorT
/**
* I observed the resulting XML and it seems correct. It is weird that this test fails.
*/
- public void xtestNestedJavaBean() throws Exception {
+ public void testNestedJavaBean() throws Exception {
DummyJavaBean bean = new DummyJavaBean();
DummyJavaBean nestedBean = new DummyJavaBean();
bean.setDummyJavaBean(nestedBean);
@@ -93,9 +97,9 @@ public class JavaBeanXmlAttributeEditorT
editor.setValue(bean);
String result = editor.getAsText();
- JavabeanType javabeanType = JavabeanType.Factory.parse(result);
- BeanPropertyType[] beanPropertyArray = javabeanType.getBeanPropertyArray();
- assertEquals(1, beanPropertyArray.length);
+ JavabeanType javabeanType = JaxbUtil.unmarshalJavabean(new StringReader(result), false);
+ List<BeanPropertyType> beanPropertyArray = javabeanType.getBeanProperty();
+ assertEquals(1, beanPropertyArray.size());
}
public void testEncryption() throws Exception {
@@ -117,7 +121,7 @@ public class JavaBeanXmlAttributeEditorT
editor.setValue(bean);
String result = editor.getAsText();
- JavabeanType javabeanType = JavabeanType.Factory.parse(result);
+ JavabeanType javabeanType = JaxbUtil.unmarshalJavabean(new StringReader(result), false);
assertPrimitive(javabeanType, "encryptOnPersist", prefix + encryptedValue);
}
Modified: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-service-builder/src/test/java/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java Tue Apr 26 23:16:56 2011
@@ -17,6 +17,7 @@
package org.apache.geronimo.deployment.service;
import java.io.File;
+import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,9 +32,8 @@ import junit.framework.TestCase;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.FooBarBean;
import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
-import org.apache.geronimo.deployment.xbeans.ModuleDocument;
-import org.apache.geronimo.deployment.xbeans.ModuleType;
+import org.apache.geronimo.deployment.service.plan.JaxbUtil;
+import org.apache.geronimo.deployment.service.plan.ModuleType;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.ReferenceCollection;
@@ -54,7 +54,6 @@ import org.apache.geronimo.kernel.reposi
import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Repository;
-import org.osgi.framework.BundleContext;
/**
* @version $Rev$ $Date$
@@ -71,7 +70,8 @@ public class ServiceConfigBuilderTest ex
File file = new File(url.getPath());
JarFile jar = new JarFile(file);
assertTrue(file.exists());
- ServiceConfigBuilder builder = new ServiceConfigBuilder(parentEnvironment, null, new Jsr77Naming(), bundleContext);
+ ServiceConfigBuilder builder = new ServiceConfigBuilder();
+ builder.activate(bundleContext);
assertNull(builder.getDeploymentPlan(null, jar, new ModuleIDBuilder()));
jar.close();
}
@@ -82,12 +82,17 @@ public class ServiceConfigBuilderTest ex
//this is kind of cheating, we rely on the builder to iterate through existing members of the collection.
referenceCollection.add(javaBeanXmlAttributeBuilder);
Naming naming = new Jsr77Naming();
- NamespaceDrivenBuilder gbeanBuilder = new GBeanBuilder(referenceCollection, null);
+ GBeanBuilder gbeanBuilder = new GBeanBuilder(referenceCollection, null);
// ConfigurationBuilder serviceBuilder = new ServiceConfigBuilder(parentEnvironment, null, Collections.singleton(gbeanBuilder), naming);
ClassLoader cl = Thread.currentThread().getContextClassLoader();
final URL plan1 = cl.getResource("services/plan1.xml");
- ModuleDocument doc = ModuleDocument.Factory.parse(plan1);
- ModuleType plan = doc.getModule();
+ InputStream in = plan1.openStream();
+ ModuleType plan;
+ try {
+ plan = JaxbUtil.unmarshalModule(in, false);
+ } finally {
+ in.close();
+ }
File outFile = File.createTempFile("foo", "bar");
outFile.delete();
if (!outFile.mkdirs()) {
@@ -110,9 +115,9 @@ public class ServiceConfigBuilderTest ex
ConfigurationManager configurationManager = new SimpleConfigurationManager(Collections.EMPTY_SET, artifactResolver, Collections.EMPTY_SET, bundleContext);
bundleContext.setConfigurationManager(configurationManager);
AbstractName moduleName = naming.createRootName(environment.getConfigId(), "foo", "bar");
- DeploymentContext context = new DeploymentContext(outFile, null, environment, moduleName, ConfigurationModuleType.CAR, naming, configurationManager, Collections.<Repository>singleton(mockRepository), bundleContext);
+ DeploymentContext context = new DeploymentContext(outFile, null, environment, moduleName, ConfigurationModuleType.CAR, naming, Collections.<Repository>singleton(mockRepository), bundleContext);
context.initializeConfiguration();
- gbeanBuilder.build(plan, context, context);
+ gbeanBuilder.build(plan.getGbean(), context, context);
Set gbeanNames = context.getGBeanNames();
assertEquals(1, gbeanNames.size());
AbstractName beanName = (AbstractName) gbeanNames.iterator().next();
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/BaseCommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/BaseCommandSupport.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/BaseCommandSupport.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/BaseCommandSupport.java Tue Apr 26 23:16:56 2011
@@ -81,7 +81,7 @@ public abstract class BaseCommandSupport
/**
* Utility method for issuing shell prompts.
*
- * @param prompt The prompt string.
+ * @param msg The prompt string.
*
* @return The string return result.
*/
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/deploy/ConnectCommand.java Tue Apr 26 23:16:56 2011
@@ -23,15 +23,14 @@ import java.io.IOException;
import org.apache.felix.gogo.commands.Command;
import org.apache.felix.gogo.commands.Option;
+import org.apache.felix.service.command.CommandSession;
import org.apache.geronimo.cli.deployer.ConnectionParamsImpl;
import org.apache.geronimo.deployment.cli.OfflineServerConnection;
import org.apache.geronimo.deployment.cli.OnlineServerConnection;
import org.apache.geronimo.deployment.cli.ServerConnection;
import org.apache.geronimo.deployment.cli.ServerConnection.UsernamePasswordHandler;
-import org.apache.geronimo.deployment.plugin.factories.BaseDeploymentFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.shell.BaseCommandSupport;
-import org.apache.felix.service.command.CommandSession;
/**
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ConfigurationExtender.java Tue Apr 26 23:16:56 2011
@@ -57,16 +57,6 @@ public class ConfigurationExtender {
private static final Logger logger = LoggerFactory.getLogger(ConfigurationExtender.class);
-// private BundleContext bundleContext;
-//
-// private ConfigurationManager configurationManager;
-//
-// private DependencyManager dependencyManager;
-//
-// private Map<Long, Artifact> bundleIdArtifactMap = new ConcurrentHashMap<Long, Artifact>();
-//
-// private Set<Long> loadedBundleIds = Collections.synchronizedSet(new HashSet<Long>());
-
private final Map<Long, Configuration> configurationMap = new ConcurrentHashMap<Long, Configuration>();
private BundleTracker bt;
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1096950&r1=1096949&r2=1096950&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Apr 26 23:16:56 2011
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.genesis</groupId>
<artifactId>genesis-java6-flava</artifactId>
- <version>2.0</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo</groupId>
@@ -1772,7 +1772,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.6.0</version>
+ <version>1.6.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1822,12 +1822,6 @@
</dependency>
<dependency>
- <groupId>org.apache.karaf.assemblies.features</groupId>
- <artifactId>karaf-framework</artifactId>
- <version>${karaf.version}</version>
- <type>kar</type>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>${karaf.version}</version>
@@ -1978,7 +1972,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>selenium-maven-plugin</artifactId>
- <version>1.1</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -2007,7 +2000,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
- <version>2.3.3</version>
<executions>
<execution>
<goals>
@@ -2024,7 +2016,6 @@
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
- <!--<version>2.0-alpha-2</version>-->
<executions>
<execution>
<goals>
@@ -2069,7 +2060,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>sql-maven-plugin</artifactId>
- <version>1.0</version>
</plugin>
<!--
@@ -2079,7 +2069,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
<configuration>
<!--
<webXml>${project.build.directory}/jspweb.xml</webXml>
@@ -2137,7 +2126,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
<extensions>true</extensions>
<configuration>
<instructions>