From 838aaacdd713d262801aa99ff161866a8939ec11 Mon Sep 17 00:00:00 2001 From: clemenso Date: Wed, 3 Sep 2008 14:53:43 +0000 Subject: accesscontrol config git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@10 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../bku/accesscontrol/config/AccessControl.java | 2 +- .../gv/egiz/bku/accesscontrol/config/Action.java | 2 +- .../at/gv/egiz/bku/accesscontrol/config/Chain.java | 2 +- .../gv/egiz/bku/accesscontrol/config/Chains.java | 2 +- .../gv/egiz/bku/accesscontrol/config/Command.java | 2 +- .../bku/accesscontrol/config/ObjectFactory.java | 52 +++++----- .../at/gv/egiz/bku/accesscontrol/config/Param.java | 2 +- .../at/gv/egiz/bku/accesscontrol/config/Rule.java | 108 ++++----------------- .../at/gv/egiz/bku/accesscontrol/config/Rules.java | 2 +- 9 files changed, 50 insertions(+), 124 deletions(-) (limited to 'bkucommon/src/main') diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java index c9efaca6..90271231 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/AccessControl.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java index 8d457d1c..b9c8fa83 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Action.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java index aa0b920b..1408c8d8 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chain.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java index f75c8dba..d58f7bad 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Chains.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java index fcba969f..0d25ca1c 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Command.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/ObjectFactory.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/ObjectFactory.java index 7291d759..0efa4beb 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/ObjectFactory.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // @@ -42,19 +42,19 @@ public class ObjectFactory { } /** - * Create an instance of {@link AccessControl } + * Create an instance of {@link Param } * */ - public AccessControl createAccessControl() { - return new AccessControl(); + public Param createParam() { + return new Param(); } /** - * Create an instance of {@link Chain } + * Create an instance of {@link AccessControl } * */ - public Chain createChain() { - return new Chain(); + public AccessControl createAccessControl() { + return new AccessControl(); } /** @@ -66,51 +66,43 @@ public class ObjectFactory { } /** - * Create an instance of {@link Chains } - * - */ - public Chains createChains() { - return new Chains(); - } - - /** - * Create an instance of {@link Rule } + * Create an instance of {@link Rules } * */ - public Rule createRule() { - return new Rule(); + public Rules createRules() { + return new Rules(); } /** - * Create an instance of {@link Rule.AnyPeer } + * Create an instance of {@link Action } * */ - public Rule.AnyPeer createRuleAnyPeer() { - return new Rule.AnyPeer(); + public Action createAction() { + return new Action(); } /** - * Create an instance of {@link Rules } + * Create an instance of {@link Chains } * */ - public Rules createRules() { - return new Rules(); + public Chains createChains() { + return new Chains(); } /** - * Create an instance of {@link Param } + * Create an instance of {@link Chain } * */ - public Param createParam() { - return new Param(); + public Chain createChain() { + return new Chain(); } /** - * Create an instance of {@link Action } + * Create an instance of {@link Rule } * */ - public Action createAction() { - return new Action(); + public Rule createRule() { + return new Rule(); } /** diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java index 44afc196..94e190ff 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Param.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java index 3c85f256..512cced9 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rule.java @@ -2,14 +2,12 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // package at.gv.egiz.bku.accesscontrol.config; -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; @@ -33,21 +31,13 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element ref="{}AuthClass"/> - * <choice> - * <element name="AnyPeer"> - * <complexType> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * </restriction> - * </complexContent> - * </complexType> - * </element> + * <choice minOccurs="0"> * <element name="DomainName" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="IPv4Address" type="{http://www.w3.org/2001/XMLSchema}string"/> * <element name="URL" type="{http://www.w3.org/2001/XMLSchema}string"/> * </choice> * <element ref="{}Command" minOccurs="0"/> - * <element ref="{}Action" maxOccurs="unbounded"/> + * <element ref="{}Action"/> * <element ref="{}UserInteraction"/> * </sequence> * <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" /> @@ -61,7 +51,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "authClass", - "anyPeer", "domainName", "iPv4Address", "url", @@ -74,8 +63,6 @@ public class Rule { @XmlElement(name = "AuthClass", required = true) protected String authClass; - @XmlElement(name = "AnyPeer") - protected Rule.AnyPeer anyPeer; @XmlElement(name = "DomainName") protected String domainName; @XmlElement(name = "IPv4Address") @@ -85,7 +72,7 @@ public class Rule { @XmlElement(name = "Command") protected Command command; @XmlElement(name = "Action", required = true) - protected List action; + protected Action action; @XmlElement(name = "UserInteraction", required = true) protected String userInteraction; @XmlAttribute(name = "Id") @@ -118,30 +105,6 @@ public class Rule { this.authClass = value; } - /** - * Gets the value of the anyPeer property. - * - * @return - * possible object is - * {@link Rule.AnyPeer } - * - */ - public Rule.AnyPeer getAnyPeer() { - return anyPeer; - } - - /** - * Sets the value of the anyPeer property. - * - * @param value - * allowed object is - * {@link Rule.AnyPeer } - * - */ - public void setAnyPeer(Rule.AnyPeer value) { - this.anyPeer = value; - } - /** * Gets the value of the domainName property. * @@ -241,30 +204,25 @@ public class Rule { /** * Gets the value of the action property. * - *

- * 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 set method for the action property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getAction().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Action } - * + * @return + * possible object is + * {@link Action } + * + */ + public Action getAction() { + return action; + } + + /** + * Sets the value of the action property. * + * @param value + * allowed object is + * {@link Action } + * */ - public List getAction() { - if (action == null) { - action = new ArrayList(); - } - return this.action; + public void setAction(Action value) { + this.action = value; } /** @@ -315,28 +273,4 @@ public class Rule { this.id = value; } - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - * 

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     *
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class AnyPeer { - - - } - } diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java index 5a5fa11f..6429e58a 100644 --- a/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java +++ b/bkucommon/src/main/java/at/gv/egiz/bku/accesscontrol/config/Rules.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-520 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.09.03 at 01:53:08 PM GMT +// Generated on: 2008.09.03 at 02:52:44 PM GMT // -- cgit v1.2.3