portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r562725 [11/33] - in /portals/pluto/branches/1.1-286-trunk-merge: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/ maven-pluto-plugin/src/ maven-pluto-plugin/src/main...
Date Sat, 04 Aug 2007 14:41:49 GMT
Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ObjectFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ObjectFactory.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ObjectFactory.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ObjectFactory.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,476 @@
+//
+// 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: 2006.12.18 at 11:28:54 AM CET 
+//
+
+
+package org.apache.pluto.descriptors.portlet;
+
+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 com.sun.java.xml.ns.portlet.portlet_app_2_0 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 
+ * DD 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 _PortletDDPortletPreferences_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet-preferences");
+    private final static QName _PortletDDSupportedPublishingEvent_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "supported-publishing-event");
+    private final static QName _PortletDDExpirationCache_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "expiration-cache");
+    private final static QName _PortletDDSupportedProcessingEvent_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "supported-processing-event");
+    private final static QName _PortletDDDescription_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "description");
+    private final static QName _PortletDDResourceBundle_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "resource-bundle");
+    private final static QName _PortletDDDisplayName_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "display-name");
+    private final static QName _PortletDDPortletClass_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet-class");
+    private final static QName _PortletDDSupportedPublicRenderParameter_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "supported-public-render-parameter");
+    private final static QName _PortletDDPortletInfo_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet-info");
+    private final static QName _PortletDDPortletName_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet-name");
+    private final static QName _PortletDDSupports_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "supports");
+    private final static QName _PortletDDSupportedLocale_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "supported-locale");
+    private final static QName _PortletApp_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet-app");
+    private final static QName _PortletApp1_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", "portlet-app");
+    private final static QName _Portlet1DD_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", "portlet");
+    private final static QName _PortletDD_QNAME = new QName("http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", "portlet");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.sun.java.xml.ns.portlet.portlet_app_2_0
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link PortletDD }
+     * 
+     */
+    public PortletDD createPortletDD() {
+        return new PortletDD();
+    }
+
+//    /**
+//     * Create an instance of {@link PortletCollectionDD }
+//     * 
+//     */
+//    public PortletCollectionDD createPortletCollectionDD() {
+//        return new PortletCollectionDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link PreferenceDD }
+//     * 
+//     */
+//    public PreferenceDD createPreferenceDD() {
+//        return new PreferenceDD();
+//    }
+
+    /**
+     * Create an instance of {@link PortletInfoDD }
+     * 
+     */
+    public PortletInfoDD createPortletInfoDD() {
+        return new PortletInfoDD();
+    }
+
+    /**
+     * Create an instance of {@link EventDefinitionDD }
+     * 
+     */
+    public EventDefinitionDD createEventDefinitionDD() {
+        return new EventDefinitionDD();
+    }
+
+//    /**
+//     * Create an instance of {@link SecurityConstraintDD }
+//     * 
+//     */
+//    public SecurityConstraintDD createSecurityConstraintDD() {
+//        return new SecurityConstraintDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link ShortTitleDD }
+//     * 
+//     */
+//    public ShortTitleDD createShortTitleDD() {
+//        return new ShortTitleDD();
+//    }
+
+//    /**
+//     * Create an instance of {@link DescriptionDD }
+//     * 
+//     */
+//    public DescriptionDD createDescriptionDD() {
+//        return new DescriptionDD();
+//    }
+
+    /**
+     * Create an instance of {@link ExpirationCacheDD }
+     * 
+     */
+    public ExpirationCacheDD createExpirationCacheDD() {
+        return new ExpirationCacheDD();
+    }
+//
+//    /**
+//     * Create an instance of {@link DisplayNameDD }
+//     * 
+//     */
+//    public DisplayNameDD createDisplayNameDD() {
+//        return new DisplayNameDD();
+//    }
+
+//    /**
+//     * Create an instance of {@link SupportedLocaleDD }
+//     * 
+//     */
+//    public SupportedLocaleDD createSupportedLocaleDD() {
+//        return new SupportedLocaleDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link UserDataConstraintDD }
+//     * 
+//     */
+//    public UserDataConstraintDD createUserDataConstraintDD() {
+//        return new UserDataConstraintDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link TitleDD }
+//     * 
+//     */
+//    public TitleDD createTitleDD() {
+//        return new TitleDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link KeywordsDD }
+//     * 
+//     */
+//    public KeywordsDD createKeywordsDD() {
+//        return new KeywordsDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link FilterDD }
+//     * 
+//     */
+//    public FilterDD createFilterDD() {
+//        return new FilterDD();
+//    }
+
+    /**
+     * Create an instance of {@link PortletAppDD }
+     * 
+     */
+    public PortletAppDD createPortletAppDD() {
+        return new PortletAppDD();
+    }
+
+//    /**
+//     * Create an instance of {@link RoleLinkDD }
+//     * 
+//     */
+//    public RoleLinkDD createRoleLinkDD() {
+//        return new RoleLinkDD();
+//    }
+
+    /**
+     * Create an instance of {@link SupportsDD }
+     * 
+     */
+    public SupportsDD createSupportsDD() {
+        return new SupportsDD();
+    }
+
+    /**
+     * Create an instance of {@link PortletPreferencesDD }
+     * 
+     */
+    public PortletPreferencesDD createPortletPreferencesDD() {
+        return new PortletPreferencesDD();
+    }
+
+//    /**
+//     * Create an instance of {@link CacheScopeDD }
+//     * 
+//     */
+//    public CacheScopeDD createCacheScopeDD() {
+//        return new CacheScopeDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link PortletModeDD }
+//     * 
+//     */
+//    public PortletModeDD createPortletModeDD() {
+//        return new PortletModeDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link CustomWindowStateDD }
+//     * 
+//     */
+//    public CustomWindowStateDD createCustomWindowStateDD() {
+//        return new CustomWindowStateDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link PortletNameDD }
+//     * 
+//     */
+//    public PortletNameDD createPortletNameDD() {
+//        return new PortletNameDD();
+//    }
+
+//    /**
+//     * Create an instance of {@link WindowStateDD }
+//     * 
+//     */
+//    public WindowStateDD createWindowStateDD() {
+//        return new WindowStateDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link ExpirationTimeDD }
+//     * 
+//     */
+//    public ExpirationTimeDD createExpirationTimeDD() {
+//        return new ExpirationTimeDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link ValueDD }
+//     * 
+//     */
+//    public ValueDD createValueDD() {
+//        return new ValueDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link CustomPortletModeDD }
+//     * 
+//     */
+//    public CustomPortletModeDD createCustomPortletModeDD() {
+//        return new CustomPortletModeDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link ResourceBundleDD }
+//     * 
+//     */
+//    public ResourceBundleDD createResourceBundleDD() {
+//        return new ResourceBundleDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link UserAttributeDD }
+//     * 
+//     */
+//    public UserAttributeDD createUserAttributeDD() {
+//        return new UserAttributeDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link MimeDDDD }
+//     * 
+//     */
+//    public MimeDDDD createMimeDDDD() {
+//        return new MimeDDDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link PublicRenderParameterDD }
+//     * 
+//     */
+//    public PublicRenderParameterDD createPublicRenderParameterDD() {
+//        return new PublicRenderParameterDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link FilterMappingDD }
+//     * 
+//     */
+//    public FilterMappingDD createFilterMappingDD() {
+//        return new FilterMappingDD();
+//    }
+//
+//    /**
+//     * Create an instance of {@link NameDD }
+//     * 
+//     */
+//    public NameDD createNameDD() {
+//        return new NameDD();
+//    }
+    
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", name = "portlet", scope = PortletAppDD.class)
+    public JAXBElement<PortletDD> createPortlet1DD(PortletDD value) {
+        return new JAXBElement<PortletDD>(_Portlet1DD_QNAME, PortletDD.class, PortletAppDD.class, value);
+    }
+    
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet", scope = PortletAppDD.class)
+    public JAXBElement<PortletDD> createPortletDD(PortletDD value) {
+        return new JAXBElement<PortletDD>(_PortletDD_QNAME, PortletDD.class, PortletAppDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletPreferencesDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet-preferences", scope = PortletDD.class)
+    public JAXBElement<PortletPreferencesDD> createPortletDDPortletPreferences(PortletPreferencesDD value) {
+        return new JAXBElement<PortletPreferencesDD>(_PortletDDPortletPreferences_QNAME, PortletPreferencesDD.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "supported-publishing-event", scope = PortletDD.class)
+    public JAXBElement<QName> createPortletDDSupportedPublishingEvent(QName value) {
+        return new JAXBElement<QName>(_PortletDDSupportedPublishingEvent_QNAME, QName.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ExpirationCacheDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "expiration-cache", scope = PortletDD.class)
+    public JAXBElement<ExpirationCacheDD> createPortletDDExpirationCache(ExpirationCacheDD value) {
+        return new JAXBElement<ExpirationCacheDD>(_PortletDDExpirationCache_QNAME, ExpirationCacheDD.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NameDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "supported-processing-event", scope = PortletDD.class)
+    public JAXBElement<QName> createPortletDDSupportedProcessingEvent(QName value) {
+        return new JAXBElement<QName>(_PortletDDSupportedProcessingEvent_QNAME, QName.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DescriptionDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "description", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDDescription(String value) {
+        return new JAXBElement<String>(_PortletDDDescription_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ResourceBundleDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "resource-bundle", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDResourceBundle(String value) {
+        return new JAXBElement<String>(_PortletDDResourceBundle_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link DisplayNameDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "display-name", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDDisplayName(String value) {
+        return new JAXBElement<String>(_PortletDDDisplayName_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet-class", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDPortletClass(String value) {
+        return new JAXBElement<String>(_PortletDDPortletClass_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "supported-public-render-parameter", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDSupportedPublicRenderParameter(String value) {
+        return new JAXBElement<String>(_PortletDDSupportedPublicRenderParameter_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletInfoDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet-info", scope = PortletDD.class)
+    public JAXBElement<PortletInfoDD> createPortletDDPortletInfo(PortletInfoDD value) {
+        return new JAXBElement<PortletInfoDD>(_PortletDDPortletInfo_QNAME, PortletInfoDD.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletNameDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet-name", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDPortletName(String value) {
+        return new JAXBElement<String>(_PortletDDPortletName_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SupportsDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "supports", scope = PortletDD.class)
+    public JAXBElement<SupportsDD> createPortletDDSupports(SupportsDD value) {
+        return new JAXBElement<SupportsDD>(_PortletDDSupports_QNAME, SupportsDD.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SupportedLocaleDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "supported-locale", scope = PortletDD.class)
+    public JAXBElement<String> createPortletDDSupportedLocale(String value) {
+        return new JAXBElement<String>(_PortletDDSupportedLocale_QNAME, String.class, PortletDD.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletAppDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", name = "portlet-app")
+    public JAXBElement<PortletAppDD> createPortletApp(PortletAppDD value) {
+        return new JAXBElement<PortletAppDD>(_PortletApp_QNAME, PortletAppDD.class, null, value);
+    }
+    
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PortletAppDD }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd", name = "portlet-app")
+    public JAXBElement<PortletAppDD> createPortletApp1(PortletAppDD value) {
+        return new JAXBElement<PortletAppDD>(_PortletApp1_QNAME, PortletAppDD.class, null, value);
+    }
+
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,281 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+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;
+
+/**
+ * Portlet Application Configuration.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version $Id: PortletAppDD.java 157475 2005-03-14 22:13:18Z ddewolf $
+ * @since Mar 6, 2005
+ *
+ *
+ * <p>Java class for portlet-appType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="portlet-appType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="portlet" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portletType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="custom-portlet-mode" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}custom-portlet-modeType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="custom-window-state" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}custom-window-stateType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="user-attribute" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}user-attributeType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="security-constraint" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}security-constraintType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="resource-bundle" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}resource-bundleType" minOccurs="0"/>
+ *         &lt;element name="filter" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}filterType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="filter-mapping" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}filter-mappingType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="event-definition" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}event-definitionType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="public-render-parameter" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}public-render-parameterType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portlet-appType", propOrder = {
+    "portlets",    "portlets1",
+    "customPortletMode","customPortletMode1",
+    "customWindowState","customWindowState1",
+    "userAttribute","userAttribute1",
+    "securityConstraint","securityConstraint1",
+    "resourceBundle","resourceBundle1",
+    "defaultNamespace",
+    "filter",
+    "filterMapping",
+    "events",
+    "render"
+})
+public class PortletAppDD {
+
+    /** The defined portlets within the system. */
+	@XmlElement(name = "portlet", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd")
+    private List<PortletDD> portlets = null;
+	
+	/** The defined portlets (jsr 168) within the system. */
+	@XmlElement(name = "portlet", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+    private List<PortletDD> portlets1 = null;
+	
+	@XmlElement(name = "custom-portlet-mode")
+	private List<CustomPortletModeDD> customPortletMode = null;
+	
+	@XmlElement(name = "custom-portlet-mode", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+	private List<CustomPortletModeDD> customPortletMode1 = null;
+	
+	@XmlElement(name = "custom-window-state")
+	private List<CustomWindowStateDD> customWindowState = null;
+	
+	@XmlElement(name = "custom-window-state", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+	private List<CustomWindowStateDD> customWindowState1 = null;
+	
+	@XmlElement(name = "user-attribute")
+	private List<UserAttributeDD> userAttribute = null;
+
+	@XmlElement(name = "user-attribute", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+	private List<UserAttributeDD> userAttribute1 = null;
+	
+	@XmlElement(name = "security-constraint")
+	private List<SecurityConstraintDD> securityConstraint = null;
+	
+	@XmlElement(name = "security-constraint", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+	private List<SecurityConstraintDD> securityConstraint1 = null;
+	
+	@XmlElement ( name = "resource-bundle")
+	private String resourceBundle = null;
+	
+	@XmlElement ( name = "resource-bundle", namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd")
+	private String resourceBundle1 = null;
+	
+	/** The default Namespace */
+	@XmlElement(name = "default-namespace")
+	private String defaultNamespace = null; 
+	
+    /** The defined Portlet Events within the system. */
+	@XmlElement(name = "event-definition")
+    private List<EventDefinitionDD> events = null;
+    
+    /** The defined public Render Parameter within the system. */
+	@XmlElement(name = "public-render-parameter")
+    private List<PublicRenderParamDD> render =null;
+	
+	@XmlElement ( name = "filter")
+	private List<FilterDD> filter = null;
+	
+	@XmlElement ( name = "filter-mapping")
+	private List<FilterMappingDD> filterMapping = null;
+	
+	@XmlAttribute(name = "version")
+	private String version;
+
+    /**
+     * Default Constructor.
+     */
+    public PortletAppDD() {
+    }
+
+    /**
+     * Retrieve the portlets which exist within this application.
+     * @return
+     */
+    public List getPortlets() {
+    	if (portlets != null)
+    		return portlets;
+    	
+    	return portlets1;
+    }
+
+    /**
+     * Set the portlets that exist within this application.
+     * @param portlets
+     */
+    public void setPortlets(List<PortletDD> portlets) {
+    	this.portlets = portlets;
+    	this.portlets1 = portlets;
+    }
+    
+    /**
+	 * @return Returns the events.
+	 */
+	public List<EventDefinitionDD> getEvents() {
+		return events;
+	}
+
+	/**
+	 * @param events The events to set.
+	 */
+	public void setEvents(List<EventDefinitionDD> events) {
+		this.events = events;
+	}
+
+	/**
+	 * @return Returns the public render parameter.
+	 */
+	public List<PublicRenderParamDD> getRender() {
+		return render;
+	}
+
+	/**
+	 * @param render The public render parameter to set.
+	 */
+	public void setRender(List<PublicRenderParamDD> render) {
+		this.render = render;
+	}
+
+	public String getVersion() {
+		return version;
+	}
+
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	public List<CustomPortletModeDD> getCustomPortletMode() {
+		if (customPortletMode != null)
+			return customPortletMode;
+		return customPortletMode1;
+	}
+
+	public void setCustomPortletMode(List<CustomPortletModeDD> customPortletMode) {
+		this.customPortletMode = customPortletMode;
+		this.customPortletMode1 = customPortletMode;
+	}
+
+	public List<CustomWindowStateDD> getCustomWindowState() {
+		if (customWindowState != null)
+			return customWindowState;
+		return customWindowState1;
+	}
+
+	public void setCustomWindowState(List<CustomWindowStateDD> customWindowState) {
+		this.customWindowState = customWindowState;
+		this.customWindowState1 = customWindowState;
+	}
+
+	public List<UserAttributeDD> getUserAttribute() {
+		if (userAttribute != null)
+			return userAttribute;
+		return userAttribute1;
+	}
+
+	public void setUserAttribute(List<UserAttributeDD> userAttribute) {
+		this.userAttribute = userAttribute;
+		this.userAttribute1 = userAttribute;
+	}
+
+	public List<SecurityConstraintDD> getSecurityConstraint() {
+		if (securityConstraint != null)
+			return securityConstraint;
+		return securityConstraint1;
+	}
+
+	public void setSecurityConstraint(List<SecurityConstraintDD> securityConstraint) {
+		this.securityConstraint = securityConstraint;
+		this.securityConstraint1 = securityConstraint;
+	}
+
+	public String getResourceBundle() {
+		if (resourceBundle != null)
+			return resourceBundle;
+		return resourceBundle1;
+	}
+
+	public void setResourceBundle(String resourceBundle) {
+		this.resourceBundle = resourceBundle;
+		this.resourceBundle1 = resourceBundle;
+	}
+
+	public List<FilterDD> getFilter() {
+		return filter;
+	}
+
+	public void setFilter(List<FilterDD> filter) {
+		this.filter = filter;
+	}
+
+	public List<FilterMappingDD> getFilterMapping() {
+		return filterMapping;
+	}
+
+	public void setFilterMapping(List<FilterMappingDD> filterMapping) {
+		this.filterMapping = filterMapping;
+	}
+
+	public String getDefaultNamespace() {
+		return defaultNamespace;
+	}
+
+	public void setDefaultNamespace(String defaultNamespace) {
+		this.defaultNamespace = defaultNamespace;
+	}
+}
+

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletCollectionDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletCollectionDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletCollectionDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletCollectionDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,48 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+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;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portlet-collectionType", propOrder = {
+    "portletName","portletName1"
+})
+public class PortletCollectionDD {
+	@XmlElement (name = "portlet-name")
+	private List<String> portletName = null;
+	
+	@XmlElement (name = "portlet-name", namespace = PortletDD.QNAME_JSR168)
+	private List<String> portletName1 = null;
+
+	public List<String> getPortletName() {
+		if (portletName != null)
+			return portletName;
+		return portletName1;
+	}
+
+	public void setPortletName(List<String> portletName) {
+		this.portletName = portletName;
+		this.portletName1 = portletName;
+	}
+
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,441 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import java.util.List;
+import java.util.Vector;
+
+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 javax.xml.namespace.QName;
+
+import org.apache.pluto.descriptors.common.InitParamDD;
+import org.apache.pluto.descriptors.common.SecurityRoleRefDD;
+
+/**
+ * Bare bones implementation of the Portlet descriptor.
+ * 
+ * FIXME: Hmmm... What do you mean, David?  --ZHENG Zhong
+ * 
+ * Eventually this should be flushed out :), but for the sake of timing I'll be lazy for now.
+ *
+ * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ * 
+ * @since Mar 6, 2005
+ *
+ * 
+ * 			The portlet element contains the declarative data of a portlet. 
+ * 			Used in: portlet-app
+ * 			
+ * 
+ * <p>Java class for portletType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="portletType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="portlet-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-nameType"/>
+ *         &lt;element name="display-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}display-nameType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="portlet-class" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-classType"/>
+ *         &lt;element name="init-param" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}init-paramType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="expiration-cache" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}expiration-cacheType" minOccurs="0"/>
+ *         &lt;element name="supports" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}supportsType" maxOccurs="unbounded"/>
+ *         &lt;element name="supported-locale" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}supported-localeType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;choice>
+ *           &lt;sequence>
+ *             &lt;element name="resource-bundle" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}resource-bundleType"/>
+ *             &lt;element name="portlet-info" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-infoType" minOccurs="0"/>
+ *           &lt;/sequence>
+ *           &lt;element name="portlet-info" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-infoType"/>
+ *         &lt;/choice>
+ *         &lt;element name="portlet-preferences" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-preferencesType" minOccurs="0"/>
+ *         &lt;element name="security-role-ref" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}security-role-refType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="supported-processing-event" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}nameType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="supported-publishing-event" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}nameType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="supported-public-render-parameter" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portletType", propOrder = {
+    //"content",
+    "supports", "supports1",
+    "securityRoleRefs","securityRoleRefs1",
+    "processingEvents",
+    "portletName",    "portletName1",
+    "initParams", "initParams1",
+    "expirationCacheDD",    "expirationCache",
+    "publishingEvents",
+    "supportedLocale","supportedLocale1",
+    "portletInfo", "portletInfo1",
+    "resourceBundle","resourceBundle1",
+    "portletClass", "portletClass1", 
+    "portletPreferences", "portletPreferences1",
+    "description",    "description1",
+    "displayName",    "displayName1",
+    "publicRenderParameter"
+})
+public class PortletDD {
+	
+	// Private Member Variables ------------------------------------------------
+	
+	public static final String QNAME_JSR168 = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
+	private static final String QNAME_JSR286 = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd";
+	private static final int EXPIRATION_CACHE_DEFAULT = -2;
+
+	@XmlElement(name = "supports")
+	private List<SupportsDD> supports = null;
+	
+	@XmlElement(name = "supports",namespace = QNAME_JSR168)
+	private List<SupportsDD> supports1 = null;
+	
+	/** All security role references. */
+	@XmlElement(name = "security-role-ref")
+    private List<SecurityRoleRefDD> securityRoleRefs = null;
+	
+	/** All security role references. */
+	@XmlElement(name = "security-role-ref",namespace = QNAME_JSR168)
+    private List<SecurityRoleRefDD> securityRoleRefs1 = null;
+	
+	/** the supported processing Events */
+	@XmlElement(name = "supported-processing-event")
+    private List<QName> processingEvents = null;
+	
+    /** The unique name of the portlet. */
+	@XmlElement(name = "portlet-name")
+    private String portletName = null;
+	
+	@XmlElement (name = "portlet-name", namespace = QNAME_JSR168)
+	private String portletName1 = null;
+	
+	@XmlElement(name = "init-param")
+    private List<InitParamDD> initParams = null;
+	
+	@XmlElement(name = "init-param",namespace = QNAME_JSR168)
+    private List<InitParamDD> initParams1 = null;
+	
+	@XmlElement(name = "expiration-cache", namespace = QNAME_JSR286)
+	private ExpirationCacheDD expirationCacheDD = null;
+	
+	@XmlElement(name = "expiration-cache", namespace = QNAME_JSR168)
+	private int expirationCache = EXPIRATION_CACHE_DEFAULT;
+	
+	/** the supported publishing Events */
+	@XmlElement(name = "supported-publishing-event")
+    private List<QName> publishingEvents = null;
+	
+	@XmlElement (name = "supported-locale")
+	private String supportedLocale = null;
+	
+	@XmlElement (name = "supported-locale", namespace = QNAME_JSR168)
+	private String supportedLocale1 = null;
+	
+	@XmlElement(name = "portlet-info")
+    private PortletInfoDD portletInfo = null;
+	
+	@XmlElement(name = "portlet-info", namespace = QNAME_JSR168)
+    private PortletInfoDD portletInfo1 = null;
+	
+	@XmlElement(name = "resource-bundle")
+    private String resourceBundle = null;
+	
+	@XmlElement(name = "resource-bundle", namespace = QNAME_JSR168)
+    private String resourceBundle1 = null;
+
+	/** The class which implements the portlet interface. */
+	@XmlElement(name = "portlet-class")
+    private String portletClass = null;
+	
+	/** The class which implements the portlet interface. */
+	@XmlElement(name = "portlet-class", namespace = QNAME_JSR168)
+    private String portletClass1 = null;
+	
+	@XmlElement(name = "portlet-preferences")
+    private PortletPreferencesDD portletPreferences = null;
+	
+	@XmlElement(name = "portlet-preferences", namespace = QNAME_JSR168)
+    private PortletPreferencesDD portletPreferences1 = null;
+	
+	@XmlElement(name = "description")
+	private String description = null;
+	
+	@XmlElement(name = "description" ,namespace = QNAME_JSR168)
+	private String description1 = null;
+    
+	@XmlElement(name = "display-name")
+	private String displayName = null;
+	
+	@XmlElement(name = "display-name", namespace = QNAME_JSR168)
+	private String displayName1 = null;
+	
+    /** the supported public render parameter */
+	@XmlElement(name = "supported-public-render-parameter")
+    private Vector<String> publicRenderParameter = null;
+    
+    
+    // Constructor -------------------------------------------------------------
+    
+    /**
+     * Default no-arg constructor.
+     */
+    public PortletDD() {
+    	// Do nothing.
+    }
+    
+    
+    // Public Methods ----------------------------------------------------------
+    
+
+
+    
+    
+    // Object Methods ----------------------------------------------------------
+    
+    /**
+     * Returns a string representation of this instance.
+     * FIXME: more info!
+     * @return a string representation of this instance.
+     */
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append(getClass().getName());
+    	buffer.append("[portletName=").append(portletName);
+    	buffer.append(",portletClass=").append(portletClass);
+    	// TODO:
+    	return buffer.toString();
+    }
+    
+    /**
+     * Returns the hash code for this instance.
+     * @return the hash code for this instance.
+     */
+    public int hashCode() {
+    	return toString().hashCode();
+    }
+
+
+	public List<InitParamDD> getInitParams() {
+		if (initParams != null)
+			return initParams;
+		return initParams1;
+	}
+
+
+	public void setInitParams(List<InitParamDD> initParams) {
+		if (initParams != null)
+			this.initParams = initParams;
+		else
+			this.initParams1 = initParams;
+	}
+
+
+	public String getPortletClass() {
+		if (portletClass != null)
+			return portletClass.trim();
+		return portletClass1.trim();
+	}
+
+
+	public void setPortletClass(String portletClass) {
+		if (portletClass != null)
+			this.portletClass = portletClass;
+		else
+			this.portletClass1 = portletClass;
+	}
+
+
+	public PortletInfoDD getPortletInfo() {
+		if (portletInfo != null)
+			return portletInfo;
+		return portletInfo1;
+	}
+
+
+	public void setPortletInfo(PortletInfoDD portletInfo) {
+		if (portletInfo != null)
+			this.portletInfo = portletInfo;
+		else
+			this.portletInfo1 = portletInfo;
+	}
+
+
+	public String getPortletName() {
+		if (portletName != null)
+			return portletName.trim();
+		return portletName1.trim();
+	}
+
+
+	public void setPortletName(String portletName) {
+		this.portletName = portletName;
+		this.portletName1 = portletName;
+	}
+
+
+	public PortletPreferencesDD getPortletPreferences() {
+		if (portletPreferences!= null)
+			return portletPreferences;
+		return portletPreferences1;
+	}
+
+
+	public void setPortletPreferences(PortletPreferencesDD portletPreferences) {
+		this.portletPreferences = portletPreferences;
+		this.portletPreferences1 = portletPreferences;
+	}
+
+
+	public List<QName> getProcessingEvents() {
+		return processingEvents;
+	}
+
+
+	public void setProcessingEvents(List<QName> processingEvents) {
+		this.processingEvents = processingEvents;
+	}
+
+
+	public List<QName> getPublishingEvents() {
+		return publishingEvents;
+	}
+
+
+	public void setPublishingEvents(List<QName> publishingEvents) {
+		this.publishingEvents = publishingEvents;
+	}
+
+
+	public Vector<String> getPublicRenderParameter() {
+		return publicRenderParameter;
+	}
+
+
+	public void setPublicRenderParameter(Vector<String> publicRenderParameter) {
+		this.publicRenderParameter = publicRenderParameter;
+	}
+
+
+	public String getResourceBundle() {
+		if (resourceBundle!= null)
+			return resourceBundle;
+		return resourceBundle1;
+	}
+
+
+	public void setResourceBundle(String resourceBundle) {
+		this.resourceBundle = resourceBundle;
+		this.resourceBundle1 = resourceBundle;
+	}
+
+
+	public List<SecurityRoleRefDD> getSecurityRoleRefs() {
+		if (securityRoleRefs!= null)
+			return securityRoleRefs;
+		return securityRoleRefs1;
+	}
+
+
+	public void setSecurityRoleRefs(List<SecurityRoleRefDD> securityRoleRefs) {
+		this.securityRoleRefs = securityRoleRefs;
+		this.securityRoleRefs1 = securityRoleRefs;
+	}
+
+
+	public List<SupportsDD> getSupports() {
+		if (supports!= null)
+			return supports;
+		return supports1;
+	}
+
+	public void setSupports(List<SupportsDD> supports) {
+		this.supports = supports;
+		this.supports1 = supports;
+	}
+
+
+	public String getDescription() {
+		if (description != null)
+			return description;
+		return description1;
+	}
+
+
+	public void setDescription(String description) {
+		this.description = description;
+		this.description1 = description;
+	}
+
+
+	public String getDisplayName() {
+		if (displayName != null)
+			return displayName;
+		return displayName1;
+	}
+
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+		this.displayName1 = displayName;
+	}
+
+
+	public String getSupportedLocale() {
+		if (supportedLocale != null)
+			return supportedLocale;
+		return supportedLocale1;
+	}
+
+
+	public void setSupportedLocale(String supportedLocale) {
+		this.supportedLocale = supportedLocale;
+		this.supportedLocale1 = supportedLocale;
+	}
+
+
+	public ExpirationCacheDD getExpirationCacheDD() {
+		// use old style expiration cache (JSR 168)
+		if (expirationCache != EXPIRATION_CACHE_DEFAULT){
+			ExpirationCacheDD result = new ExpirationCacheDD();
+			result.expirationTime = expirationCache;
+			result.scope = "";
+			return result;
+		}
+		
+		return expirationCacheDD;
+	}
+
+
+	public void setExpirationCacheDD(ExpirationCacheDD expirationCacheDD) {
+		expirationCache = expirationCacheDD.getExpirationTime();
+		this.expirationCacheDD = expirationCacheDD;
+	}
+}
+

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletInfoDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,108 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Implementation of the Portlet Info descriptor element.
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @since 1.1.0-SNAPSHOT
+ *
+ * <p>Java class for portlet-infoType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="portlet-infoType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="title" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}titleType" minOccurs="0"/>
+ *         &lt;element name="short-title" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}short-titleType" minOccurs="0"/>
+ *         &lt;element name="keywords" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}keywordsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portlet-infoType", propOrder = {
+    "title","title1",
+    "shortTitle","shortTitle1",
+    "keywords","keywords1"
+})
+public class PortletInfoDD {
+	@XmlElement (name = "title")
+    private String title;
+	
+	@XmlElement (name = "title", namespace =PortletDD.QNAME_JSR168)
+    private String title1;
+    
+    @XmlElement (name = "short-title")
+    private String shortTitle;
+    
+    @XmlElement (name = "short-title", namespace =PortletDD.QNAME_JSR168)
+    private String shortTitle1;
+    
+    @XmlElement (name="keywords")
+    private String keywords;
+    
+    @XmlElement (name="keywords", namespace =PortletDD.QNAME_JSR168)
+    private String keywords1;
+
+    public String getTitle() {
+    	if (title != null)
+    		return title;
+    	return title1;
+    }
+
+    public void setTitle(String title) {
+    	this.title = title;
+    	this.title1 = title;
+    }
+
+    public String getKeywords() {
+    	if (keywords != null)
+    		return keywords;
+    	return keywords1;
+    }
+
+    public void setKeywords(String keywords) {
+    	this.keywords = keywords;
+    	this.keywords1 = keywords;
+    }
+
+    public String getShortTitle() {
+    	if (shortTitle != null)
+    		return shortTitle;
+    	return shortTitle1;
+    }
+
+    public void setShortTitle(String shortTitle) {
+    	this.shortTitle = shortTitle;
+    	this.shortTitle1 = shortTitle;
+    }
+
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferenceDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,129 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Portlet preference definition in portlet.xml.
+ * 
+ * @see PortletPreferencesDD
+ * 
+ * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ * @since Jun 29, 2005
+ *
+ * 
+ * 			Persistent preference values that may be used for customization 
+ * 			and personalization by the portlet.
+ * 			Used in: portlet-preferences
+ * 			
+ * 
+ * <p>Java class for preferenceType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="preferenceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}nameType"/>
+ *         &lt;element name="value" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}valueType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="read-only" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}read-onlyType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "preferenceType", propOrder = {
+    "name","name1",
+    "values","values1",
+    "readOnly","readOnly1"
+})
+public class PortletPreferenceDD {
+	
+	/** The preference name. */
+	@XmlElement(name = "name")
+    private String name = null;
+    
+    /** The preference name. */
+	@XmlElement(name = "name", namespace = PortletDD.QNAME_JSR168)
+    private String name1 = null;
+    
+    /** The preference values. */
+    @XmlElement(name = "value")
+    private List<String> values = null;
+    
+    /** The preference values. */
+    @XmlElement(name = "value", namespace = PortletDD.QNAME_JSR168)
+    private List<String> values1 = null;
+    
+    /** Flag indicating if this preference is marked as read-only. */
+    @XmlElement(name = "read-only")
+    private boolean readOnly = false;
+    
+    /** Flag indicating if this preference is marked as read-only. */
+    @XmlElement(name = "read-only", namespace = PortletDD.QNAME_JSR168)
+    private boolean readOnly1 = false;
+    
+    
+    // Public Methods ----------------------------------------------------------
+    
+    public String getName() {
+    	if (name != null)
+    		return name;
+    	return name1;
+    }
+
+    public void setName(String name) {
+    	this.name = name;
+    	this.name1 = name;
+    }
+
+    public List<String> getValues() {
+    	if (values != null)
+    		return values;
+    	return values1;
+    }
+    
+    public void setValues(List<String> values) {
+    	this.values = values;
+    	this.values1 = values;
+    }
+    
+    public boolean isReadOnly() {
+    	return readOnly || readOnly1;
+    }
+    
+    public void setReadOnly(boolean readOnly) {
+    	this.readOnly = readOnly;
+    	this.readOnly1 = readOnly;
+    }
+    
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletPreferencesDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,105 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import java.util.List;
+import java.util.ArrayList;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * Portlet preferences definition in portlet.xml.
+ *
+ * @see PortletPreferenceDD
+ * 
+ * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ * @since Jun 29, 2005
+ *
+ * 
+ * 			Portlet persistent preference store.
+ * 			Used in: portlet
+ * 			
+ * 
+ * <p>Java class for portlet-preferencesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="portlet-preferencesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="preference" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}preferenceType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="preferences-validator" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}preferences-validatorType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "portlet-preferencesType", propOrder = {
+    "portletPreferences","portletPreferences1",
+    "preferencesValidator", "preferencesValidator1"
+})
+public class PortletPreferencesDD {
+	
+	/** List of portlet preferences. */
+	@XmlElement(name = "preference")
+    private List<PortletPreferenceDD> portletPreferences = null;
+	
+	/** List of portlet preferences. */
+	@XmlElement(name = "preference", namespace = PortletDD.QNAME_JSR168)
+    private List<PortletPreferenceDD> portletPreferences1 = null;
+    
+    /** Portlet preferences validator class name. */
+    @XmlElement(name = "preferences-validator")
+    private String preferencesValidator;
+    
+    /** Portlet preferences validator class name. */
+    @XmlElement(name = "preferences-validator", namespace = PortletDD.QNAME_JSR168)
+    private String preferencesValidator1;
+
+    public List<PortletPreferenceDD> getPortletPreferences() {
+    	if (portletPreferences != null)
+    		return portletPreferences;
+    	return portletPreferences1;
+    }
+
+    public void setPortletPreferences(List<PortletPreferenceDD> portletPreferences) {
+    	this.portletPreferences = portletPreferences;
+    	this.portletPreferences1 = portletPreferences;
+    }
+
+    public String getPreferencesValidator() {
+    	if (preferencesValidator != null)
+    		return preferencesValidator;
+    	return preferencesValidator1;
+    }
+
+    public void setPreferencesValidator(String preferencesValidator) {
+    	this.preferencesValidator = preferencesValidator;
+    	this.preferencesValidator1 = preferencesValidator;
+    }
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PublicRenderParamDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,129 @@
+/*  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.pluto.descriptors.portlet;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+/**
+ * Initialization Event Definitions
+ * 
+ * @author <a href="mailto:dettborn@dettborn.minet.uni-jena.de">Torsten Dettborn</a>
+ *
+ *
+ * 
+ * 			The public-render-parameters defines a render parameter that is allowed to be public
+ * 			with other portlets.
+ * 			The identifier must be used for referencing this public render parameter in the portlet code.
+ * 			Used in: portlet-app
+ * 			
+ * 
+ * <p>Java class for public-render-parameterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * <complexType name="public-render-parameterType">
+ *		<annotation>
+ *			<documentation>
+ *			The public-render-parameters defines a render parameter that is allowed to be public
+ * 			and thus be shared with other portlets.
+ *			The identifier must be used for referencing this public render parameter in the portlet code.
+ *			Used in: portlet-app
+ *			</documentation>
+ *		</annotation>
+ * 		<sequence>
+ *			<element name="description" type="portlet:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+ *			<element name="identifier" type="string"/>
+ *			<element name="name" type="xs:QName" maxOccurs="unbounded"/>
+ *		</sequence>
+ *		<attribute name="id" type="string" use="optional"/>
+ *	</complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "public-render-parameterType", propOrder = {
+    "description",
+    "identifier",
+    "name"
+})
+
+public class PublicRenderParamDD {
+	
+	/**
+	 * Descripton of the public render Parameter
+	 */
+	private String description;
+	
+	/**
+	 * Identifier
+	 */
+	private String identifier;
+	
+	/**
+	 * Name of the public render Parameter
+	 */
+	private QName name;		
+
+	/**
+	 * @return the description
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * @param description The description to set
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	/**
+	 * @return the ID
+	 */
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	/**
+	 * @param id The ID to set
+	 */
+	public void setIdentifier(String id) {
+		identifier = id;
+	}
+
+	/**
+	 * @return the name
+	 */
+	public QName getName() {
+		return name;
+	}
+
+	/**
+	 * @param name The name to set
+	 */
+	public void setName(QName name) {
+		this.name = name;
+	}
+
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SecurityConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SecurityConstraintDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SecurityConstraintDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SecurityConstraintDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,83 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "security-constraintType", propOrder = {
+    "displayName","displayName1",
+    "portletCollection","portletCollection1",
+    "userDataConstraint",    "userDataConstraint1"
+})
+public class SecurityConstraintDD {
+	
+	@XmlElement (name = "display-name")
+	private String displayName = null;
+	
+	@XmlElement (name = "display-name", namespace = PortletDD.QNAME_JSR168)
+	private String displayName1 = null;
+	
+	@XmlElement ( name = "portlet-collection")
+	private PortletCollectionDD portletCollection = null; 
+	
+	@XmlElement ( name = "portlet-collection", namespace = PortletDD.QNAME_JSR168)
+	private PortletCollectionDD portletCollection1 = null; 
+	
+	@XmlElement ( name = "user-data-constraint")
+	private UserDataConstraintDD userDataConstraint = null;
+	
+	@XmlElement ( name = "user-data-constraint", namespace = PortletDD.QNAME_JSR168)
+	private UserDataConstraintDD userDataConstraint1 = null;
+
+	public String getDisplayName() {
+		if (displayName != null)
+			return displayName;
+		return displayName1;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+		this.displayName1 = displayName;
+	}
+
+	public PortletCollectionDD getPortletCollection() {
+		if (portletCollection != null)
+			return portletCollection;
+		return portletCollection1;
+	}
+
+	public void setPortletCollection(PortletCollectionDD portletCollection) {
+		this.portletCollection = portletCollection;
+		this.portletCollection1 = portletCollection;
+	}
+
+	public UserDataConstraintDD getUserDataConstraint() {
+		if (userDataConstraint != null)
+			return userDataConstraint;
+		return userDataConstraint1;
+	}
+
+	public void setUserDataConstraint(UserDataConstraintDD userDataConstraint) {
+		this.userDataConstraint = userDataConstraint;
+		this.userDataConstraint1 = userDataConstraint;
+	}
+
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SupportsDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SupportsDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SupportsDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SupportsDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,98 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+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;
+
+/**
+ * Representation of the supports element within the portlet.xml
+ * 
+ *
+ * 
+ * 			Supports indicates the portlet modes a 
+ * 			portlet supports for a specific content type. All portlets must 
+ * 			support the view mode. 
+ * 			Used in: portlet
+ * 			
+ * 
+ * <p>Java class for supportsType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="supportsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="mime-type" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}mime-typeType"/>
+ *         &lt;element name="portlet-mode" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-modeType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "supportsType", propOrder = {
+    "mimeType","mimeType1",
+    "portletModes","portletModes1"
+})
+public class SupportsDD {
+
+	@XmlElement(name = "mime-type")
+    private String mimeType;
+	
+	@XmlElement(name = "mime-type", namespace = PortletDD.QNAME_JSR168)
+    private String mimeType1;
+	
+	@XmlElement(name = "portlet-mode")
+    private List<String> portletModes = null;
+	
+	@XmlElement(name = "portlet-mode", namespace = PortletDD.QNAME_JSR168)
+    private List<String> portletModes1 = null;
+
+    public String getMimeType() {
+    	if (mimeType != null)
+    		return mimeType;
+    	return mimeType1;
+    }
+
+    public void setMimeType(String mimeType) {
+    	this.mimeType = mimeType;
+    	this.mimeType1 = mimeType;
+    }
+
+    public List<String> getPortletModes() {
+    	if (portletModes != null)
+    		return portletModes;
+    	return portletModes1;
+    }
+
+    public void setPortletModes(List<String> portletModes) {
+    	this.portletModes = portletModes;
+    	this.portletModes1 = portletModes;
+    }
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserAttributeDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,64 @@
+/*
+ * 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.pluto.descriptors.portlet;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "user-attributeType", propOrder = {
+    "description","description1",
+    "name","name1"
+})
+public class UserAttributeDD {
+	
+	@XmlElement(name = "description")
+	private String description = null;
+	
+	@XmlElement(name = "description", namespace = PortletDD.QNAME_JSR168)
+	private String description1 = null;
+	
+	@XmlElement ( name = "name")
+	private String name = null;
+	
+	@XmlElement ( name = "name", namespace = PortletDD.QNAME_JSR168)
+	private String name1 = null;
+
+	public String getDescription() {
+		if (description != null)
+			return description;
+		return description1;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+		this.description1 = description;
+	}
+
+	public String getName() {
+		if (name != null)
+			return name;
+		return name1;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+		this.name1 = name;
+	}
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserDataConstraintDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserDataConstraintDD.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserDataConstraintDD.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/UserDataConstraintDD.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,49 @@
+package org.apache.pluto.descriptors.portlet;
+
+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;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "user-data-constraintType", propOrder = {
+		"description","description1",
+		"transportGuarantee", "transportGuarantee1"
+})
+public class UserDataConstraintDD {
+	@XmlElement(name = "description")
+	private List<String> description = null;
+	
+	@XmlElement(name = "description", namespace = PortletDD.QNAME_JSR168)
+	private List<String> description1 = null;
+	
+	@XmlElement(name = "transport-guarantee")
+	private String transportGuarantee = null;
+	
+	@XmlElement(name = "transport-guarantee", namespace = PortletDD.QNAME_JSR168)
+	private String transportGuarantee1 = null;
+	
+	public List<String> getDescription() {
+		if (description != null)
+			return description;
+		return description1;
+	}
+
+	public void setDescription(List<String> description) {
+		this.description = description;
+		this.description1 = description;
+	}
+
+	public String getTransportGuarantee() {
+		if (transportGuarantee != null)
+			return transportGuarantee;
+		return transportGuarantee1;
+	}
+
+	public void setTransportGuarantee(String transportGuarantee) {
+		this.transportGuarantee = transportGuarantee;
+		this.transportGuarantee1 = transportGuarantee;
+	}
+}

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/jaxb.index
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/jaxb.index?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/jaxb.index (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/jaxb.index Sat Aug  4 07:41:23 2007
@@ -0,0 +1,10 @@
+EventDD
+EventDefinitionDD
+PortletAppDD
+PortletDD
+PortletInfoDD
+PortletPreferenceDD
+PortletPreferencesDD
+PublicRenderParamDD
+SupportsDD
+ExpirationCacheDD

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/package-info.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/package-info.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/package-info.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/package-info.java Sat Aug  4 07:41:23 2007
@@ -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: 2006.12.18 at 11:28:54 AM CET 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.pluto.descriptors.portlet;

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/Constants.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,36 @@
+/*
+ * 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.pluto.descriptors.services;
+/**
+ *
+ * @version $Id: Constants.java 156636 2005-03-09 12:16:31Z cziegeler $
+ * @since Mar 7, 2005
+ */
+public class Constants {
+
+    public static final String WEB_XML_PUBLIC_ID = "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN";
+    public static final String WEB_XML_DTD = "http://java.sun.com/dtd/web-app_2_3.dtd";
+
+    public static final String PORLTET_XML_PUBLIC_ID = "-//Sun Microsystems, Inc.//DTD PortletApplication 1.0//EN";
+    public static final String PORTLET_XML_DTD = "http://java.sun.com/dtd/portlet-app_1_0.dtd";
+
+    private Constants() {
+
+    }
+
+}
+

Added: portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java?view=auto&rev=562725
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java (added)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/services/PortletAppDescriptorService.java Sat Aug  4 07:41:23 2007
@@ -0,0 +1,52 @@
+/*
+ * 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.pluto.descriptors.services;
+
+import org.apache.pluto.descriptors.portlet.PortletAppDD;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Read/Write services for Portlet Application configuration
+ * This service reads the portlet.xml and converts it to a
+ * standard bean model.
+ *
+ * @version $Id: PortletAppDescriptorService.java 157038 2005-03-11 03:44:40Z ddewolf $
+ * @since Mar 6, 2005
+ */
+public interface PortletAppDescriptorService {
+
+    /**
+     * Retrieve the PortletApp deployment descriptor
+     * (portlet.xml).
+     * @return Object representation of the descriptor.
+     * @throws IOException if an IO error occurs.
+     */
+    PortletAppDD read(InputStream in) throws IOException;
+
+    /**
+     * Write the PortletApp deployment descriptor
+     * (portlet.xml).
+     * @param portletDescriptor
+     * @param out
+     * @throws IOException if an IO error occurs.
+     */
+    void write(PortletAppDD portletDescriptor, OutputStream out) throws IOException;
+}



Mime
View raw message