You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/06/08 06:40:28 UTC
svn commit: r952535 [12/26] - in
/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins:
org.apache.geronimo.j2ee.v11.jaxbmodel/
org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/
org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo...
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.security;
+
+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.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for role-mappingsType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="role-mappingsType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="role" type="{http://geronimo.apache.org/xml/ns/security-1.1}roleType" maxOccurs="unbounded"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "role-mappingsType", propOrder = {
+ "role"
+})
+public class RoleMappingsType {
+
+ @XmlElement(required = true)
+ protected List<RoleType> role;
+
+ /**
+ * Gets the value of the role 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 role property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getRole().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link RoleType }
+ *
+ *
+ */
+ public List<RoleType> getRole() {
+ if (role == null) {
+ role = new ArrayList<RoleType>();
+ }
+ return this.role;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleMappingsType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,234 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.security;
+
+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 roleType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="roleType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="description" type="{http://geronimo.apache.org/xml/ns/security-1.1}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="realm-principal" type="{http://geronimo.apache.org/xml/ns/security-1.1}realmPrincipalType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="login-domain-principal" type="{http://geronimo.apache.org/xml/ns/security-1.1}loginDomainPrincipalType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="principal" type="{http://geronimo.apache.org/xml/ns/security-1.1}principalType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="distinguished-name" type="{http://geronimo.apache.org/xml/ns/security-1.1}distinguishedNameType" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="role-name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "roleType", propOrder = {
+ "description",
+ "realmPrincipal",
+ "loginDomainPrincipal",
+ "principal",
+ "distinguishedName"
+})
+public class RoleType {
+
+ protected List<DescriptionType> description;
+ @XmlElement(name = "realm-principal")
+ protected List<RealmPrincipalType> realmPrincipal;
+ @XmlElement(name = "login-domain-principal")
+ protected List<LoginDomainPrincipalType> loginDomainPrincipal;
+ protected List<PrincipalType> principal;
+ @XmlElement(name = "distinguished-name")
+ protected List<DistinguishedNameType> distinguishedName;
+ @XmlAttribute(name = "role-name", required = true)
+ protected String roleName;
+
+ /**
+ * Gets the value of the description 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 description property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getDescription().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link DescriptionType }
+ *
+ *
+ */
+ public List<DescriptionType> getDescription() {
+ if (description == null) {
+ description = new ArrayList<DescriptionType>();
+ }
+ return this.description;
+ }
+
+ /**
+ * Gets the value of the realmPrincipal 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 realmPrincipal property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getRealmPrincipal().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link RealmPrincipalType }
+ *
+ *
+ */
+ public List<RealmPrincipalType> getRealmPrincipal() {
+ if (realmPrincipal == null) {
+ realmPrincipal = new ArrayList<RealmPrincipalType>();
+ }
+ return this.realmPrincipal;
+ }
+
+ /**
+ * Gets the value of the loginDomainPrincipal 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 loginDomainPrincipal property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getLoginDomainPrincipal().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link LoginDomainPrincipalType }
+ *
+ *
+ */
+ public List<LoginDomainPrincipalType> getLoginDomainPrincipal() {
+ if (loginDomainPrincipal == null) {
+ loginDomainPrincipal = new ArrayList<LoginDomainPrincipalType>();
+ }
+ return this.loginDomainPrincipal;
+ }
+
+ /**
+ * Gets the value of the principal 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 principal property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getPrincipal().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link PrincipalType }
+ *
+ *
+ */
+ public List<PrincipalType> getPrincipal() {
+ if (principal == null) {
+ principal = new ArrayList<PrincipalType>();
+ }
+ return this.principal;
+ }
+
+ /**
+ * Gets the value of the distinguishedName 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 distinguishedName property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getDistinguishedName().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link DistinguishedNameType }
+ *
+ *
+ */
+ public List<DistinguishedNameType> getDistinguishedName() {
+ if (distinguishedName == null) {
+ distinguishedName = new ArrayList<DistinguishedNameType>();
+ }
+ return this.distinguishedName;
+ }
+
+ /**
+ * Gets the value of the roleName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getRoleName() {
+ return roleName;
+ }
+
+ /**
+ * Sets the value of the roleName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setRoleName(String value) {
+ this.roleName = value;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/RoleType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,228 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.security;
+
+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;
+
+
+/**
+ *
+ * Security entries
+ *
+ * If this element is present, all web and EJB modules MUST make the
+ * appropriate access checks as outlined in the JACC spec.
+ *
+ *
+ * <p>Java class for securityType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="securityType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="description" type="{http://geronimo.apache.org/xml/ns/security-1.1}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="default-principal" type="{http://geronimo.apache.org/xml/ns/security-1.1}default-principalType"/>
+ * <element name="role-mappings" type="{http://geronimo.apache.org/xml/ns/security-1.1}role-mappingsType" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="default-role" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="doas-current-caller" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * <attribute name="use-context-handler" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "securityType", propOrder = {
+ "description",
+ "defaultPrincipal",
+ "roleMappings"
+})
+public class SecurityType {
+
+ protected List<DescriptionType> description;
+ @XmlElement(name = "default-principal", required = true)
+ protected DefaultPrincipalType defaultPrincipal;
+ @XmlElement(name = "role-mappings")
+ protected RoleMappingsType roleMappings;
+ @XmlAttribute(name = "default-role")
+ protected String defaultRole;
+ @XmlAttribute(name = "doas-current-caller")
+ protected Boolean doasCurrentCaller;
+ @XmlAttribute(name = "use-context-handler")
+ protected Boolean useContextHandler;
+
+ /**
+ * Gets the value of the description 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 description property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getDescription().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link DescriptionType }
+ *
+ *
+ */
+ public List<DescriptionType> getDescription() {
+ if (description == null) {
+ description = new ArrayList<DescriptionType>();
+ }
+ return this.description;
+ }
+
+ /**
+ * Gets the value of the defaultPrincipal property.
+ *
+ * @return
+ * possible object is
+ * {@link DefaultPrincipalType }
+ *
+ */
+ public DefaultPrincipalType getDefaultPrincipal() {
+ return defaultPrincipal;
+ }
+
+ /**
+ * Sets the value of the defaultPrincipal property.
+ *
+ * @param value
+ * allowed object is
+ * {@link DefaultPrincipalType }
+ *
+ */
+ public void setDefaultPrincipal(DefaultPrincipalType value) {
+ this.defaultPrincipal = value;
+ }
+
+ /**
+ * Gets the value of the roleMappings property.
+ *
+ * @return
+ * possible object is
+ * {@link RoleMappingsType }
+ *
+ */
+ public RoleMappingsType getRoleMappings() {
+ return roleMappings;
+ }
+
+ /**
+ * Sets the value of the roleMappings property.
+ *
+ * @param value
+ * allowed object is
+ * {@link RoleMappingsType }
+ *
+ */
+ public void setRoleMappings(RoleMappingsType value) {
+ this.roleMappings = value;
+ }
+
+ /**
+ * Gets the value of the defaultRole property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDefaultRole() {
+ return defaultRole;
+ }
+
+ /**
+ * Sets the value of the defaultRole property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDefaultRole(String value) {
+ this.defaultRole = value;
+ }
+
+ /**
+ * Gets the value of the doasCurrentCaller property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isDoasCurrentCaller() {
+ if (doasCurrentCaller == null) {
+ return false;
+ } else {
+ return doasCurrentCaller;
+ }
+ }
+
+ /**
+ * Sets the value of the doasCurrentCaller property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setDoasCurrentCaller(Boolean value) {
+ this.doasCurrentCaller = value;
+ }
+
+ /**
+ * Gets the value of the useContextHandler property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isUseContextHandler() {
+ if (useContextHandler == null) {
+ return false;
+ } else {
+ return useContextHandler;
+ }
+ }
+
+ /**
+ * Sets the value of the useContextHandler property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setUseContextHandler(Boolean value) {
+ this.useContextHandler = value;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/SecurityType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/security-1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.j2ee.security;
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/security/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.web;
+
+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.XmlAnyElement;
+import javax.xml.bind.annotation.XmlType;
+import org.w3c.dom.Element;
+
+
+/**
+ * <p>Java class for container-configType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="container-configType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <any/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "container-configType", propOrder = {
+ "any"
+})
+public class ContainerConfigType {
+
+ @XmlAnyElement(lax = true)
+ protected List<Object> any;
+
+ /**
+ * Gets the value of the any 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 any property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAny().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Object }
+ * {@link Element }
+ *
+ *
+ */
+ public List<Object> getAny() {
+ if (any == null) {
+ any = new ArrayList<Object>();
+ }
+ return this.any;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ContainerConfigType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,68 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.web;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.apache.geronimo.xml.ns.j2ee.web_1 package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _WebApp_QNAME = new QName("http://geronimo.apache.org/xml/ns/j2ee/web-1.1", "web-app");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.xml.ns.j2ee.web_1
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link WebAppType }
+ *
+ */
+ public WebAppType createWebAppType() {
+ return new WebAppType();
+ }
+
+ /**
+ * Create an instance of {@link ContainerConfigType }
+ *
+ */
+ public ContainerConfigType createContainerConfigType() {
+ return new ContainerConfigType();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link WebAppType }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/j2ee/web-1.1", name = "web-app")
+ public JAXBElement<WebAppType> createWebApp(WebAppType value) {
+ return new JAXBElement<WebAppType>(_WebApp_QNAME, WebAppType.class, null, value);
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/ObjectFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,484 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+
+package org.apache.geronimo.j2ee.web;
+
+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.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.geronimo.j2ee.deployment.EnvironmentType;
+import org.apache.geronimo.j2ee.deployment.GbeanType;
+import org.apache.geronimo.j2ee.naming.EjbLocalRefType;
+import org.apache.geronimo.j2ee.naming.EjbRefType;
+import org.apache.geronimo.j2ee.naming.GbeanLocatorType;
+import org.apache.geronimo.j2ee.naming.GbeanRefType;
+import org.apache.geronimo.j2ee.naming.MessageDestinationType;
+import org.apache.geronimo.j2ee.naming.ResourceEnvRefType;
+import org.apache.geronimo.j2ee.naming.ResourceRefType;
+import org.apache.geronimo.j2ee.naming.ServiceRefType;
+import org.apache.geronimo.j2ee.security.SecurityType;
+
+
+/**
+ * <p>Java class for web-appType complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="web-appType">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element ref="{http://geronimo.apache.org/xml/ns/deployment-1.1}environment" minOccurs="0"/>
+ * <element name="context-root" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * <element ref="{http://geronimo.apache.org/xml/ns/naming-1.1}web-container" minOccurs="0"/>
+ * <element name="container-config" type="{http://geronimo.apache.org/xml/ns/j2ee/web-1.1}container-configType" minOccurs="0"/>
+ * <group ref="{http://geronimo.apache.org/xml/ns/naming-1.1}jndiEnvironmentRefsGroup"/>
+ * <element ref="{http://geronimo.apache.org/xml/ns/naming-1.1}message-destination" maxOccurs="unbounded" minOccurs="0"/>
+ * <sequence minOccurs="0">
+ * <element name="security-realm-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ * <element ref="{http://geronimo.apache.org/xml/ns/security-1.1}security" minOccurs="0"/>
+ * </sequence>
+ * <element ref="{http://geronimo.apache.org/xml/ns/deployment-1.1}gbean" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "web-appType", propOrder = {
+ "environment",
+ "contextRoot",
+ "webContainer",
+ "containerConfig",
+ "gbeanRef",
+ "ejbRef",
+ "ejbLocalRef",
+ "serviceRef",
+ "resourceRef",
+ "resourceEnvRef",
+ "messageDestination",
+ "securityRealmName",
+ "security",
+ "gbean"
+})
+public class WebAppType {
+
+ @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.1")
+ protected EnvironmentType environment;
+ @XmlElement(name = "context-root")
+ protected String contextRoot;
+ @XmlElement(name = "web-container", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected GbeanLocatorType webContainer;
+ @XmlElement(name = "container-config")
+ protected ContainerConfigType containerConfig;
+ @XmlElement(name = "gbean-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<GbeanRefType> gbeanRef;
+ @XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<EjbRefType> ejbRef;
+ @XmlElement(name = "ejb-local-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<EjbLocalRefType> ejbLocalRef;
+ @XmlElement(name = "service-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<ServiceRefType> serviceRef;
+ @XmlElement(name = "resource-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<ResourceRefType> resourceRef;
+ @XmlElement(name = "resource-env-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<ResourceEnvRefType> resourceEnvRef;
+ @XmlElement(name = "message-destination", namespace = "http://geronimo.apache.org/xml/ns/naming-1.1")
+ protected List<MessageDestinationType> messageDestination;
+ @XmlElement(name = "security-realm-name")
+ protected String securityRealmName;
+ @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/security-1.1")
+ protected SecurityType security;
+ @XmlElement(namespace = "http://geronimo.apache.org/xml/ns/deployment-1.1")
+ protected List<GbeanType> gbean;
+
+ /**
+ * Gets the value of the environment property.
+ *
+ * @return
+ * possible object is
+ * {@link EnvironmentType }
+ *
+ */
+ public EnvironmentType getEnvironment() {
+ return environment;
+ }
+
+ /**
+ * Sets the value of the environment property.
+ *
+ * @param value
+ * allowed object is
+ * {@link EnvironmentType }
+ *
+ */
+ public void setEnvironment(EnvironmentType value) {
+ this.environment = value;
+ }
+
+ /**
+ * Gets the value of the contextRoot property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getContextRoot() {
+ return contextRoot;
+ }
+
+ /**
+ * Sets the value of the contextRoot property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setContextRoot(String value) {
+ this.contextRoot = value;
+ }
+
+ /**
+ * Gets the value of the webContainer property.
+ *
+ * @return
+ * possible object is
+ * {@link GbeanLocatorType }
+ *
+ */
+ public GbeanLocatorType getWebContainer() {
+ return webContainer;
+ }
+
+ /**
+ * Sets the value of the webContainer property.
+ *
+ * @param value
+ * allowed object is
+ * {@link GbeanLocatorType }
+ *
+ */
+ public void setWebContainer(GbeanLocatorType value) {
+ this.webContainer = value;
+ }
+
+ /**
+ * Gets the value of the containerConfig property.
+ *
+ * @return
+ * possible object is
+ * {@link ContainerConfigType }
+ *
+ */
+ public ContainerConfigType getContainerConfig() {
+ return containerConfig;
+ }
+
+ /**
+ * Sets the value of the containerConfig property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ContainerConfigType }
+ *
+ */
+ public void setContainerConfig(ContainerConfigType value) {
+ this.containerConfig = value;
+ }
+
+ /**
+ * Gets the value of the gbeanRef 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 gbeanRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getGbeanRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link GbeanRefType }
+ *
+ *
+ */
+ public List<GbeanRefType> getGbeanRef() {
+ if (gbeanRef == null) {
+ gbeanRef = new ArrayList<GbeanRefType>();
+ }
+ return this.gbeanRef;
+ }
+
+ /**
+ * Gets the value of the ejbRef 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 ejbRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getEjbRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link EjbRefType }
+ *
+ *
+ */
+ public List<EjbRefType> getEjbRef() {
+ if (ejbRef == null) {
+ ejbRef = new ArrayList<EjbRefType>();
+ }
+ return this.ejbRef;
+ }
+
+ /**
+ * Gets the value of the ejbLocalRef 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 ejbLocalRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getEjbLocalRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link EjbLocalRefType }
+ *
+ *
+ */
+ public List<EjbLocalRefType> getEjbLocalRef() {
+ if (ejbLocalRef == null) {
+ ejbLocalRef = new ArrayList<EjbLocalRefType>();
+ }
+ return this.ejbLocalRef;
+ }
+
+ /**
+ * Gets the value of the serviceRef 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 serviceRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getServiceRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link ServiceRefType }
+ *
+ *
+ */
+ public List<ServiceRefType> getServiceRef() {
+ if (serviceRef == null) {
+ serviceRef = new ArrayList<ServiceRefType>();
+ }
+ return this.serviceRef;
+ }
+
+ /**
+ * Gets the value of the resourceRef 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 resourceRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getResourceRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link ResourceRefType }
+ *
+ *
+ */
+ public List<ResourceRefType> getResourceRef() {
+ if (resourceRef == null) {
+ resourceRef = new ArrayList<ResourceRefType>();
+ }
+ return this.resourceRef;
+ }
+
+ /**
+ * Gets the value of the resourceEnvRef 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 resourceEnvRef property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getResourceEnvRef().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link ResourceEnvRefType }
+ *
+ *
+ */
+ public List<ResourceEnvRefType> getResourceEnvRef() {
+ if (resourceEnvRef == null) {
+ resourceEnvRef = new ArrayList<ResourceEnvRefType>();
+ }
+ return this.resourceEnvRef;
+ }
+
+ /**
+ * Gets the value of the messageDestination 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 messageDestination property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getMessageDestination().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link MessageDestinationType }
+ *
+ *
+ */
+ public List<MessageDestinationType> getMessageDestination() {
+ if (messageDestination == null) {
+ messageDestination = new ArrayList<MessageDestinationType>();
+ }
+ return this.messageDestination;
+ }
+
+ /**
+ * Gets the value of the securityRealmName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSecurityRealmName() {
+ return securityRealmName;
+ }
+
+ /**
+ * Sets the value of the securityRealmName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSecurityRealmName(String value) {
+ this.securityRealmName = value;
+ }
+
+ /**
+ * Gets the value of the security property.
+ *
+ * @return
+ * possible object is
+ * {@link SecurityType }
+ *
+ */
+ public SecurityType getSecurity() {
+ return security;
+ }
+
+ /**
+ * Sets the value of the security property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SecurityType }
+ *
+ */
+ public void setSecurity(SecurityType value) {
+ this.security = value;
+ }
+
+ /**
+ * Gets the value of the gbean 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 gbean property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getGbean().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link GbeanType }
+ *
+ *
+ */
+ public List<GbeanType> getGbean() {
+ if (gbean == null) {
+ gbean = new ArrayList<GbeanType>();
+ }
+ return this.gbean;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/WebAppType.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.0.2-b01-fcs
+// 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: 2009.07.17 at 01:03:24 AM CST
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/xml/ns/j2ee/web-1.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.geronimo.j2ee.web;
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/main/java/org/apache/geronimo/j2ee/web/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Tue Jun 8 04:40:16 2010
@@ -4,6 +4,7 @@ Bundle-Name: Geronimo Common Runtime Plu
Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
Bundle-Version: 2.2.1
Bundle-ClassPath:
+ lib/geronimo-jaxb_2.1_spec-1.0.jar,
lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
lib/commons-logging-1.0.4.jar,
lib/cglib-nodep-2.1_3.jar,
@@ -39,14 +40,6 @@ Export-Package:
com.sun.xml.txw2,
com.sun.xml.txw2.annotation,
com.sun.xml.txw2.output,
- javax.enterprise.deploy.model,
- javax.enterprise.deploy.model.exceptions,
- javax.enterprise.deploy.shared,
- javax.enterprise.deploy.shared.factories,
- javax.enterprise.deploy.spi,
- javax.enterprise.deploy.spi.exceptions,
- javax.enterprise.deploy.spi.factories,
- javax.enterprise.deploy.spi.status,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.bind.annotation.adapters,
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.common/pom.xml Tue Jun 8 04:40:16 2010
@@ -99,10 +99,6 @@
<overWriteSnapshots>true</overWriteSnapshots>
<artifactItems>
<artifactItem>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </artifactItem>
- <artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</artifactItem>
@@ -193,10 +189,7 @@
<version>${version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxb_2.1_spec</artifactId>
@@ -212,10 +205,10 @@
<artifactId>jaxb-api</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF Tue Jun 8 04:40:16 2010
@@ -17,8 +17,14 @@ Bundle-ClassPath: lib/openejb-builder-2.
lib/geronimo-deployment-1.1.1.jar,
lib/geronimo-deploy-jsr88-1.1.1.jar,
lib/geronimo-connector-builder-1.1.1.jar,
- lib/geronimo-common-1.1.1.jar
-Export-Package: org.apache.geronimo.common,
+ lib/geronimo-common-1.1.1.jar,
+ lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar
+Export-Package: javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
+ org.apache.geronimo.common,
org.apache.geronimo.common.propertyeditor,
org.apache.geronimo.connector.deployment,
org.apache.geronimo.connector.deployment.dconfigbean,
@@ -180,13 +186,11 @@ Export-Package: org.apache.geronimo.comm
schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001,
schemaorg_apache_xmlbeans.src.modules,
- schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
schemaorg_apache_xmlbeans.system.s624ECD384556376FBF6D19CFF950A0F4,
- schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
- schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
schemaorg_apache_xmlbeans.system.sD54265BC20BB40986932114D35E4E1A4,
+ schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
schemaorg_apache_xmlbeans.type.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
schemaorg_apache_xmlbeans.type.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
schemaorg_apache_xmlbeans.type.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.runtime.v11/pom.xml Tue Jun 8 04:40:16 2010
@@ -98,6 +98,11 @@
<configuration>
<artifactItems>
<artifactItem>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.0</version>
+ </artifactItem>
+ <artifactItem>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${geronimoVersion}</version>
@@ -390,5 +395,10 @@
<artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/.classpath?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/.classpath Tue Jun 8 04:40:16 2010
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Tue Jun 8 04:40:16 2010
@@ -7,8 +7,6 @@ Bundle-Activator: org.apache.geronimo.st
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Require-Bundle: org.apache.geronimo.runtime.common,
- org.apache.geronimo.runtime.v22,
- org.apache.geronimo.jee.v21.jaxbmodel,
org.eclipse.core.runtime,
org.eclipse.wst.server.core,
org.eclipse.jst.j2ee,
@@ -18,13 +16,13 @@ Require-Bundle: org.apache.geronimo.runt
org.eclipse.core.runtime,
org.eclipse.wst.common.frameworks;visibility:=reexport,
org.eclipse.core.commands;visibility:=reexport,
- org.eclipse.wst.server.core,
+ org.eclipse.wst.server.core;visibility:=reexport,
org.eclipse.jst.server.core;visibility:=reexport,
org.eclipse.jdt.launching;visibility:=reexport,
- org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.project.facet.core;visibility:=reexport,
org.eclipse.jdt.core,
org.eclipse.debug.core,
- org.eclipse.wst.web,
+ org.eclipse.wst.web;visibility:=reexport,
org.eclipse.jem.util,
org.eclipse.jst.j2ee.core,
org.eclipse.emf.ecore,
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/pom.xml?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/pom.xml Tue Jun 8 04:40:16 2010
@@ -140,17 +140,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.runtime.v22</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
+ <artifactId>org.apache.geronimo.runtime.v21</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/Activator.java Tue Jun 8 04:40:16 2010
@@ -18,9 +18,6 @@ package org.apache.geronimo.st.core;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerLifecycleListener;
-import org.eclipse.wst.server.core.ServerCore;
import org.osgi.framework.BundleContext;
/**
@@ -50,62 +47,11 @@ public class Activator extends Plugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- ServerCore.addServerLifecycleListener(new IServerLifecycleListener() {
- public void serverAdded(IServer server) {
- triggerStartUpdateServerTask(server);
- }
-
- public void serverChanged(IServer server) {
-
- }
-
- public void serverRemoved(IServer server) {
- }
- });
- IServer[] servers = ServerCore.getServers();
- for(int i = 0; i < servers.length; i++) {
- triggerStartUpdateServerTask(servers[i]);
- }
- }
-
-
- /**
- * <b>triggerStartUpdateServerTask</b> is invoked from:
- * <ul>
- * <li>The WTP ResourceManager after a new server has been defined (via the WTP NewServerWizard)
- * <li>When a server lifecycle listener has been added (see above)
- * </ul>
- *
- * @param server
- */
- private void triggerStartUpdateServerTask(IServer server) {
- GeronimoServerBehaviourDelegate delegate = (GeronimoServerBehaviourDelegate) server.getAdapter(GeronimoServerBehaviourDelegate.class);
- if (delegate == null) {
- delegate = (GeronimoServerBehaviourDelegate) server.loadAdapter(GeronimoServerBehaviourDelegate.class, null);
- }
- if (delegate != null) {
- delegate.startUpdateServerStateTask();
- }
+
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- IServer[] servers = ServerCore.getServers();
- for(int i = 0; i < servers.length; i++) {
- GeronimoServerBehaviourDelegate delegate = (GeronimoServerBehaviourDelegate) servers[i].getAdapter(GeronimoServerBehaviourDelegate.class);
- if(delegate != null) {
- delegate.stopUpdateServerStateTask();
- }
- }
- ModuleArtifactMapper.getInstance().save();
- super.stop(context);
- plugin = null;
- }
+
/**
* Returns the shared instance
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.st.core;
+
+import org.apache.geronimo.st.core.internal.Trace;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
+import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;
+
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DeploymentPlanInstallConfig {
+
+ private String groupId;
+
+ private String artifactId;
+
+ private String version;
+
+ private String type;
+
+ private boolean sharedLib;
+
+ public static final class Factory implements IActionConfigFactory
+ {
+ public Object create()
+ {
+ Trace.tracePoint("Entry/Exit", "DeploymentPlanInstallConfig.create");
+
+ enableGenerationDDByDefault();
+
+ return new DeploymentPlanInstallConfig();
+ }
+
+ /*
+ * by default, WTP won't generate deployment descriptor for all the projects(only true for web project).
+ * Try to generate deployment descriptor by default for all projects, the default value are set here
+ *
+ * reference to J2EEPreferences.java in org.eclipse.jst.j2ee bundle
+ */
+
+
+ private void enableGenerationDDByDefault(){
+ J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.APPLICATION_GENERATE_DD,true);
+ J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.DYNAMIC_WEB_GENERATE_DD,true);
+ J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.EJB_GENERATE_DD,true);
+ J2EEPlugin.getDefault().getJ2EEPreferences().setValue(J2EEPreferences.Keys.APP_CLIENT_GENERATE_DD,true);
+ }
+ }
+
+ public String getArtifactId() {
+ return artifactId;
+ }
+
+ public void setArtifactId(String artifactId) {
+ this.artifactId = artifactId;
+ }
+
+ public String getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public boolean isSharedLib() {
+ return sharedLib;
+ }
+
+ public void setSharedLib(boolean sharedLib) {
+ this.sharedLib = sharedLib;
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentPlanInstallConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Tue Jun 8 04:40:16 2010
@@ -40,7 +40,6 @@ Export-Package: org.apache.geronimo.st.u
org.apache.geronimo.st.ui.commands,
org.apache.geronimo.st.ui.editors,
org.apache.geronimo.st.ui.internal,
- org.apache.geronimo.st.ui.pages,
org.apache.geronimo.st.ui.sections,
org.apache.geronimo.st.ui.wizards,
org.apache.geronimo.st.ui.refactoring
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/.classpath Tue Jun 8 04:40:16 2010
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Tue Jun 8 04:40:16 2010
@@ -7,9 +7,8 @@ Bundle-Activator: org.apache.geronimo.st
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Require-Bundle: org.apache.geronimo.runtime.v11,
- org.apache.geronimo.st.v21.core;bundle-version="2.2.0",
org.apache.geronimo.st.core,
- org.apache.geronimo.j2ee.v11.jaxbmodel;bundle-version="2.2.0",
+ org.apache.geronimo.j2ee.v11.jaxbmodel,
org.eclipse.core.runtime,
org.eclipse.wst.server.core,
org.eclipse.debug.core,
@@ -17,10 +16,15 @@ Require-Bundle: org.apache.geronimo.runt
org.eclipse.jst.common.frameworks,
org.eclipse.wst.common.modulecore,
org.eclipse.jst.j2ee,
- org.eclipse.jem.util
+ org.eclipse.jem.util,
+ org.eclipse.jdt.core,
+ org.eclipse.jst.j2ee.ejb,
+ org.eclipse.jst.j2ee.jca,
+ org.eclipse.jst.j2ee.web
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.st.v11.core,
org.apache.geronimo.st.v11.core.internal,
org.apache.geronimo.st.v11.core.jaxb,
org.apache.geronimo.st.v11.core.operations
+Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/pom.xml Tue Jun 8 04:40:16 2010
@@ -137,26 +137,45 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.core</artifactId>
<version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.st.v21.core</artifactId>
- <version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v11</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/Activator.java?rev=952535&r1=952534&r2=952535&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/Activator.java Tue Jun 8 04:40:16 2010
@@ -16,8 +16,13 @@
*/
package org.apache.geronimo.st.v11.core;
+import org.apache.geronimo.st.v11.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.core.ModuleArtifactMapper;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerLifecycleListener;
+import org.eclipse.wst.server.core.ServerCore;
import org.osgi.framework.BundleContext;
/**
@@ -47,17 +52,25 @@ public class Activator extends Plugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
+
+ ServerCore.addServerLifecycleListener(new IServerLifecycleListener() {
+ public void serverAdded(IServer server) {
+ triggerStartUpdateServerTask(server);
+ }
+
+ public void serverChanged(IServer server) {
+
+ }
+
+ public void serverRemoved(IServer server) {
+ }
+ });
+ IServer[] servers = ServerCore.getServers();
+ for(int i = 0; i < servers.length; i++) {
+ triggerStartUpdateServerTask(servers[i]);
+ }
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
/**
* Returns the shared instance
@@ -71,4 +84,42 @@ public class Activator extends Plugin {
public static void log(int severity, String message, Throwable throwable) {
plugin.getLog().log(new Status(severity, PLUGIN_ID, 0, message, throwable));
}
+
+ /**
+ * <b>triggerStartUpdateServerTask</b> is invoked from:
+ * <ul>
+ * <li>The WTP ResourceManager after a new server has been defined (via the WTP NewServerWizard)
+ * <li>When a server lifecycle listener has been added (see above)
+ * </ul>
+ *
+ * @param server
+ */
+ private void triggerStartUpdateServerTask(IServer server) {
+ GeronimoServerBehaviourDelegate delegate = (GeronimoServerBehaviourDelegate) server.getAdapter(GeronimoServerBehaviourDelegate.class);
+ if (delegate == null) {
+ delegate = (GeronimoServerBehaviourDelegate) server.loadAdapter(GeronimoServerBehaviourDelegate.class, null);
+ }
+ if (delegate != null) {
+ delegate.startUpdateServerStateTask();
+ }
+ }
+
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ IServer[] servers = ServerCore.getServers();
+ for(int i = 0; i < servers.length; i++) {
+ GeronimoServerBehaviourDelegate delegate = (GeronimoServerBehaviourDelegate) servers[i].getAdapter(GeronimoServerBehaviourDelegate.class);
+ if(delegate != null) {
+ delegate.stopUpdateServerStateTask();
+ }
+ }
+ ModuleArtifactMapper.getInstance().save();
+ super.stop(context);
+ plugin = null;
+ }
}
Added: geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/DeploymentStatusMessage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/DeploymentStatusMessage.java?rev=952535&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/DeploymentStatusMessage.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.2.1/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/DeploymentStatusMessage.java Tue Jun 8 04:40:16 2010
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.geronimo.st.v11.core;
+
+import javax.enterprise.deploy.shared.ActionType;
+import javax.enterprise.deploy.shared.CommandType;
+import javax.enterprise.deploy.spi.status.DeploymentStatus;
+
+/**
+ * @version $Rev: 471551 $ $Date: 2006-11-06 06:47:11 +0800 (Mon, 06 Nov 2006) $
+ */
+public class DeploymentStatusMessage {
+
+ private DeploymentStatus status;
+ private ActionType action;
+ private CommandType command;
+ private String message;
+
+ public DeploymentStatusMessage(DeploymentStatus status) {
+ this.status = status;
+ this.action = status.getAction();
+ this.command = status.getCommand();
+ this.message = status.getMessage();
+ }
+
+ public ActionType getAction() {
+ return action;
+ }
+
+ public CommandType getCommand() {
+ return command;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public DeploymentStatus getStatus() {
+ return status;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#toString()
+ *
+ * [ActionType CommandType] message
+ */
+ public String toString() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("[").append(action).append(" ").append(command).append("] ").append(message);
+ return buffer.toString();
+ }
+
+}