You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/11/27 13:37:50 UTC
[09/38] portals-pluto git commit: Replaced code that reads the
deployment descriptor with an implementation that can be better extended to
add v3.0 support. Added test cases. Uses jaxb binding classes that are
generated at compile time.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/UserDataConstraintType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/UserDataConstraintType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/UserDataConstraintType.java
deleted file mode 100644
index dccacc2..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/UserDataConstraintType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.container.om.portlet20.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.Description;
-import org.apache.pluto.container.om.portlet.UserDataConstraint;
-
-/**
- * The user-data-constraintType is used to indicate how data communicated between the client and portlet should be
- * protected. Used in: security-constraint <p>Java class for user-data-constraintType complex type. <p>The following
- * schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="user-data-constraintType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="transport-guarantee" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}transport-guaranteeType"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "user-data-constraintType", propOrder = { "description", "transportGuarantee" })
-public class UserDataConstraintType implements UserDataConstraint
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(name = "transport-guarantee", required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String transportGuarantee;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public String getTransportGuarantee()
- {
- return transportGuarantee;
- }
-
- public void setTransportGuarantee(String value)
- {
- transportGuarantee = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/package-info.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/package-info.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/package-info.java
deleted file mode 100644
index 6796276..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet20/impl/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.
- *
- * @version $Id$
- */
-@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.container.om.portlet20.impl;
-
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ContainerRuntimeOptionType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ContainerRuntimeOptionType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ContainerRuntimeOptionType.java
deleted file mode 100644
index 0f75ef3..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ContainerRuntimeOptionType.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.ContainerRuntimeOption;
-
-/**
- * The container-runtime-option element contains settings for the portlet container that the portlet expects to be
- * honored at runtime. These settings may re-define default portlet container behavior, like the javax.portlet.escapeXml
- * setting that disables XML encoding of URLs produced by the portlet tag library as default. Names with the
- * javax.portlet prefix are reserved for the Java Portlet Specification. Used in: portlet-app, portlet <p>Java class
- * for container-runtime-optionType complex type. <p>The following schema fragment specifies the expected content
- * contained within this class.
- *
- * <pre>
- * <complexType name="container-runtime-optionType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}nameType"/>
- * <element name="value" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}valueType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "container-runtime-optionType", propOrder = { "name", "value" })
-public class ContainerRuntimeOptionType implements ContainerRuntimeOption
-{
- @XmlElement(required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String name;
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected List<String> value;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String value)
- {
- name = value;
- }
-
- public List<String> getValues()
- {
- if (value == null)
- {
- value = new ArrayList<String>();
- }
- return value;
- }
-
- public void addValue(String value)
- {
- getValues().add(value);
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomPortletModeType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomPortletModeType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomPortletModeType.java
deleted file mode 100644
index 6499712..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomPortletModeType.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.CustomPortletMode;
-import org.apache.pluto.container.om.portlet.Description;
-
-/**
- * A custom portlet mode that one or more portlets in this portlet application supports. If the portal does not need to
- * provide some management functionality for this portlet mode, the portal-managed element needs to be set to "false",
- * otherwise to "true". Default is "true". Used in: portlet-app <p>Java class for custom-portlet-modeType complex type.
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="custom-portlet-modeType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="portlet-mode" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-modeType"/>
- * <element name="portal-managed" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portal-managedType" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "custom-portlet-modeType", propOrder = { "description", "portletMode", "portalManaged" })
-public class CustomPortletModeType implements CustomPortletMode
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(name = "portlet-mode", required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String portletMode;
- @XmlElement(name = "portal-managed")
- protected Boolean portalManaged;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public String getPortletMode()
- {
- return portletMode != null ? portletMode.toLowerCase() : null;
- }
-
- public void setPortletMode(String value)
- {
- portletMode = value.toLowerCase();
- }
-
- public boolean isPortalManaged()
- {
- return portalManaged != null ? portalManaged.booleanValue() : true;
- }
-
- public void setPortalManaged(boolean value)
- {
- portalManaged = value ? Boolean.TRUE : Boolean.FALSE;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomWindowStateType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomWindowStateType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomWindowStateType.java
deleted file mode 100644
index 80a1c92..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/CustomWindowStateType.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.CustomWindowState;
-import org.apache.pluto.container.om.portlet.Description;
-
-/**
- * A custom window state that one or more portlets in this portlet application supports. Used in: portlet-app <p>Java
- * class for custom-window-stateType complex type. <p>The following schema fragment specifies the expected content
- * contained within this class.
- *
- * <pre>
- * <complexType name="custom-window-stateType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="window-state" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}window-stateType"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "custom-window-stateType", propOrder = { "description", "windowState" })
-public class CustomWindowStateType implements CustomWindowState
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(name = "window-state", required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String windowState;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public String getWindowState()
- {
- return windowState != null ? windowState.toLowerCase() : null;
- }
-
- public void setWindowState(String value)
- {
- windowState = value.toLowerCase();
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DescriptionType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DescriptionType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DescriptionType.java
deleted file mode 100644
index 6c86768..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DescriptionType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.Locale;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.Description;
-
-/**
- * The description element is used to provide text describing the parent element. The description element should include
- * any information that the portlet application war file producer wants to provide to the consumer of the portlet
- * application war file (i.e., to the Deployer). Typically, the tools used by the portlet application war file consumer
- * will display the description when processing the parent element that contains the description. It has an optional
- * attribute xml:lang to indicate which language is used in the description according to RFC 1766
- * (http://www.ietf.org/rfc/rfc1766.txt). The default value of this attribute is English(“en�?). Used in: init-param,
- * portlet, portlet-app, security-role <p>Java class for descriptionType complex type. <p>The following schema
- * fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="descriptionType">
- * <simpleContent>
- * <extension base="<http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd>string">
- * <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
- * </extension>
- * </simpleContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "descriptionType", propOrder = { "value" })
-public class DescriptionType implements Description
-{
- @XmlValue
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String value;
- @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace")
- protected String lang = null;
- @XmlTransient
- protected Locale locale;
-
- public String getDescription()
- {
- return value;
- }
-
- public void setDescription(String value)
- {
- this.value = value;
- }
-
- public String getLang()
- {
- return lang == null ? Locale.ENGLISH.toString() : lang;
- }
-
- public void setLang(String value)
- {
- lang = value;
- deriveLocale();
- }
-
- public Locale getLocale()
- {
- return locale == null ? deriveLocale() : locale;
- }
-
- protected Locale deriveLocale()
- {
- Locale locale = null;
- String lang = this.getLang();
- if (lang != null)
- {
- String country = "";
- String variant = "";
- String[] localeArray = lang.split("[-|_]");
- for (int i = 0; i < localeArray.length; i++)
- {
- if (i == 0)
- {
- lang = localeArray[i];
- }
- else if (i == 1)
- {
- country = localeArray[i];
- }
- else if (i == 2)
- {
- variant = localeArray[i];
- }
- }
- locale = new Locale(lang, country, variant);
- }
- return this.locale = locale;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DisplayNameType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DisplayNameType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DisplayNameType.java
deleted file mode 100644
index ae3fbbd..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/DisplayNameType.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.Locale;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.DisplayName;
-
-/**
- * The display-name type contains a short name that is intended to be displayed by tools. It is used by display-name
- * elements. The display name need not be unique. Example: ...
- *
- * <pre>
- * <?xml version="1.0" encoding="UTF-8"?><display-name xmlns="http://www.w3.org/2001/XMLSchema" xmlns:portlet="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">Employee Self Service</display-name>
- * </pre>
- *
- * It has an optional attribute xml:lang to indicate which language is used in the description according to RFC 1766
- * (http://www.ietf.org/rfc/rfc1766.txt). The default value of this attribute is English(“en�?). <p>Java class for
- * display-nameType complex type. <p>The following schema fragment specifies the expected content contained within this
- * class.
- *
- * <pre>
- * <complexType name="display-nameType">
- * <simpleContent>
- * <extension base="<http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd>string">
- * <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
- * </extension>
- * </simpleContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "display-nameType", propOrder = { "value" })
-public class DisplayNameType implements DisplayName
-{
- @XmlValue
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String value;
- @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace")
- protected String lang = null;
- @XmlTransient
- protected Locale locale;
-
- public String getDisplayName()
- {
- return value;
- }
-
- public void setDisplayName(String value)
- {
- this.value = value;
- }
-
- public String getLang()
- {
- return lang == null ? Locale.ENGLISH.toString() : lang;
- }
-
- public void setLang(String value)
- {
- lang = value;
- }
-
- public Locale getLocale()
- {
- return locale == null ? deriveLocale() : locale;
- }
-
- protected Locale deriveLocale()
- {
- Locale locale = null;
- String lang = this.getLang();
- if (lang != null)
- {
- String country = "";
- String variant = "";
- String[] localeArray = lang.split("[-|_]");
- for (int i = 0; i < localeArray.length; i++)
- {
- if (i == 0)
- {
- lang = localeArray[i];
- }
- else if (i == 1)
- {
- country = localeArray[i];
- }
- else if (i == 2)
- {
- variant = localeArray[i];
- }
- }
- locale = new Locale(lang, country, variant);
- }
- return this.locale = locale;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionReferenceType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionReferenceType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionReferenceType.java
deleted file mode 100644
index 81679fa..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionReferenceType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.pluto.container.om.portlet.EventDefinitionReference;
-
-/**
- * The event-definition-referenceType is used to reference events declared with the event-definition element at
- * application level. Used in: portlet <p>Java class for event-definition-referenceType complex type. <p>The following
- * schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="event-definition-referenceType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <choice>
- * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/>
- * <element name="name" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
- * </choice>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "event-definition-referenceType", propOrder = { "qname", "name" })
-public class EventDefinitionReferenceType implements EventDefinitionReference
-{
- protected QName qname;
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlSchemaType(name = "NCName")
- protected String name;
-
- public QName getQName()
- {
- return qname;
- }
-
- public void setQName(QName value)
- {
- qname = value;
- name = null;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String value)
- {
- name = value;
- qname = null;
- }
-
- public QName getQualifiedName(String defaultNamespace)
- {
- return qname != null ? qname : name != null ? new QName(defaultNamespace, name) : null;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionType.java
deleted file mode 100644
index 237fff4..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/EventDefinitionType.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import javax.xml.namespace.QName;
-
-import org.apache.pluto.container.om.portlet.Description;
-import org.apache.pluto.container.om.portlet.EventDefinition;
-
-/**
- * The event-definitionType is used to declare events the portlet can either receive or emit. The name must be unique
- * and must be the one the portlet is using in its code for referencing this event. Used in: portlet-app <p>Java class
- * for event-definitionType complex type. <p>The following schema fragment specifies the expected content contained
- * within this class.
- *
- * <pre>
- * <complexType name="event-definitionType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <choice>
- * <element name="qname" type="{http://www.w3.org/2001/XMLSchema}QName"/>
- * <element name="name" type="{http://www.w3.org/2001/XMLSchema}NCName"/>
- * </choice>
- * <element name="alias" type="{http://www.w3.org/2001/XMLSchema}QName" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="value-type" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}fully-qualified-classType" minOccurs="0"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "event-definitionType", propOrder = { "description", "qname", "name", "alias", "valueType" })
-public class EventDefinitionType implements EventDefinition
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- protected QName qname;
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- @XmlSchemaType(name = "NCName")
- protected String name;
- protected List<QName> alias;
- @XmlElement(name = "value-type")
- protected String valueType;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public QName getQName()
- {
- return qname;
- }
-
- public void setQName(QName value)
- {
- qname = value;
- name = null;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String value)
- {
- name = value;
- qname = null;
- }
-
- public List<QName> getAliases()
- {
- if (alias == null)
- {
- alias = new ArrayList<QName>();
- }
- return alias;
- }
-
- public void addAlias(QName alias)
- {
- // TODO: check for duplicates
- getAliases().add(alias);
- }
-
- public String getValueType()
- {
- return valueType;
- }
-
- public void setValueType(String value)
- {
- valueType = value;
- }
-
- public QName getQualifiedName(String defaultNamespace)
- {
- return qname != null ? qname : name != null ? new QName(defaultNamespace, name) : null;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterMappingType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterMappingType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterMappingType.java
deleted file mode 100644
index e2c7815..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterMappingType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.FilterMapping;
-
-/**
- * Declaration of the filter mappings in this portlet application is done by using filter-mappingType. The container
- * uses the filter-mapping declarations to decide which filters to apply to a request, and in what order. To determine
- * which filters to apply it matches filter-mapping declarations on the portlet-name and the lifecyle phase defined in
- * the filter element. The order in which filters are invoked is the order in which filter-mapping declarations that
- * match appear in the list of filter-mapping elements. Used in: portlet-app <p>Java class for filter-mappingType
- * complex type. <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="filter-mappingType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="filter-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}filter-nameType"/>
- * <element name="portlet-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}portlet-nameType" maxOccurs="unbounded"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "filter-mappingType", propOrder = { "filterName", "portletName" })
-public class FilterMappingType implements FilterMapping
-{
- @XmlElement(name = "filter-name", required = true)
- protected String filterName;
- @XmlElement(name = "portlet-name", required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected List<String> portletName;
-
- public String getFilterName()
- {
- return filterName;
- }
-
- public void setFilterName(String value)
- {
- filterName = value;
- }
-
- public List<String> getPortletNames()
- {
- if (portletName == null)
- {
- portletName = new ArrayList<String>();
- }
- return portletName;
- }
-
- public void addPortletName(String name)
- {
- // TODO: check for duplicates
- getPortletNames().add(name);
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterType.java
deleted file mode 100644
index ff13368..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/FilterType.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.pluto.container.om.portlet.Description;
-import org.apache.pluto.container.om.portlet.DisplayName;
-import org.apache.pluto.container.om.portlet.Filter;
-import org.apache.pluto.container.om.portlet.InitParam;
-
-/**
- * The filter element specifies a filter that can transform the content of portlet requests and portlet responses.
- * Filters can access the initialization parameters declared in the deployment descriptor at runtime via the
- * FilterConfig interface. A filter can be restricted to one or more lifecycle phases of the portlet. Valid entries for
- * lifecycle are: ACTION_PHASE, EVENT_PHASE, RENDER_PHASE, RESOURCE_PHASE Used in: portlet-app <p>Java class for
- * filterType complex type. <p>The following schema fragment specifies the expected content contained within this
- * class.
- *
- * <pre>
- * <complexType name="filterType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="display-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}display-nameType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="filter-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}filter-nameType"/>
- * <element name="filter-class" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}fully-qualified-classType"/>
- * <element name="lifecycle" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" maxOccurs="unbounded"/>
- * <element name="init-param" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}init-paramType" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "filterType", propOrder = { "description", "displayName", "filterName", "filterClass", "lifecycle",
- "initParam" })
-public class FilterType implements Filter
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<DisplayNameType> displayName;
- @XmlElement(name = "filter-name", required = true)
- protected String filterName;
- @XmlElement(name = "filter-class", required = true)
- protected String filterClass;
- @XmlElement(required = true)
- protected List<String> lifecycle;
- @XmlElement(name = "init-param")
- protected List<InitParamType> initParam;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public DisplayName getDisplayName(Locale locale)
- {
- for (DisplayName d : getDisplayNames())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends DisplayName> getDisplayNames()
- {
- if (displayName == null)
- {
- displayName = new ArrayList<DisplayNameType>();
- }
- return displayName;
- }
-
- public DisplayName addDisplayName(String lang)
- {
- DisplayNameType d = new DisplayNameType();
- d.setLang(lang);
- if (getDisplayName(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("DisplayName for language: "+d.getLocale()+" already defined");
- }
- getDisplayNames();
- displayName.add(d);
- return d;
- }
-
- public String getFilterName()
- {
- return filterName;
- }
-
- public void setFilterName(String value)
- {
- filterName = value;
- }
-
- public String getFilterClass()
- {
- return filterClass;
- }
-
- public void setFilterClass(String value)
- {
- filterClass = value;
- }
-
- public List<String> getLifecycles()
- {
- if (lifecycle == null)
- {
- lifecycle = new ArrayList<String>();
- }
- return lifecycle;
- }
-
- public void addLifecycle(String name)
- {
- // TODO: check valid name and duplicates
- getLifecycles().add(name);
- }
-
- public InitParam getInitParam(String name)
- {
- for (InitParam param : getInitParams())
- {
- if (param.getParamName().equals(name))
- {
- return param;
- }
- }
- return null;
- }
-
- public List<? extends InitParam> getInitParams()
- {
- if (initParam == null)
- {
- initParam = new ArrayList<InitParamType>();
- }
- return initParam;
- }
-
- public InitParam addInitParam(String paramName)
- {
- if (getInitParam(paramName) != null)
- {
- throw new IllegalArgumentException("Init parameter: "+paramName+" already defined");
- }
- InitParamType param = new InitParamType();
- param.setParamName(paramName);
- getInitParams();
- initParam.add(param);
- return param;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/InitParamType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/InitParamType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/InitParamType.java
deleted file mode 100644
index f0fc42f..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/InitParamType.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-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.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.apache.pluto.container.om.portlet.Description;
-import org.apache.pluto.container.om.portlet.InitParam;
-
-/**
- * The init-param element contains a name/value pair as an initialization param of the portlet Used in:portlet <p>Java
- * class for init-paramType complex type. <p>The following schema fragment specifies the expected content contained
- * within this class.
- *
- * <pre>
- * <complexType name="init-paramType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}nameType"/>
- * <element name="value" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}valueType"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "init-paramType", propOrder = { "description", "name", "value" })
-public class InitParamType implements InitParam
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String name;
- @XmlElement(required = true)
- @XmlJavaTypeAdapter(value=CollapsedStringAdapter.class)
- protected String value;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public String getParamName()
- {
- return name;
- }
-
- public void setParamName(String value)
- {
- name = value;
- }
-
- public String getParamValue()
- {
- return value;
- }
-
- public void setParamValue(String value)
- {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ListenerType.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ListenerType.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ListenerType.java
deleted file mode 100644
index b98b3fb..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ListenerType.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.apache.pluto.container.om.portlet.Description;
-import org.apache.pluto.container.om.portlet.DisplayName;
-import org.apache.pluto.container.om.portlet.Listener;
-
-/**
- * The listenerType is used to declare listeners for this portlet application. Used in: portlet-app <p>Java class for
- * listenerType complex type. <p>The following schema fragment specifies the expected content contained within this
- * class.
- *
- * <pre>
- * <complexType name="listenerType">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="description" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}descriptionType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="display-name" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}display-nameType" maxOccurs="unbounded" minOccurs="0"/>
- * <element name="listener-class" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}fully-qualified-classType"/>
- * </sequence>
- * <attribute name="id" type="{http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd}string" />
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- * @version $Id$
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "listenerType", propOrder = { "description", "displayName", "listenerClass" })
-public class ListenerType implements Listener
-{
- @XmlElement(name = "description")
- protected List<DescriptionType> description;
- @XmlElement(name = "display-name")
- protected List<DisplayNameType> displayName;
- @XmlElement(name = "listener-class", required = true)
- protected String listenerClass;
-
- public Description getDescription(Locale locale)
- {
- for (Description d : getDescriptions())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends Description> getDescriptions()
- {
- if (description == null)
- {
- description = new ArrayList<DescriptionType>();
- }
- return description;
- }
-
- public Description addDescription(String lang)
- {
- DescriptionType d = new DescriptionType();
- d.setLang(lang);
- if (getDescription(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("Description for language: "+d.getLocale()+" already defined");
- }
- getDescriptions();
- description.add(d);
- return d;
- }
-
- public DisplayName getDisplayName(Locale locale)
- {
- for (DisplayName d : getDisplayNames())
- {
- if (d.getLocale().equals(locale))
- {
- return d;
- }
- }
- return null;
- }
-
- public List<? extends DisplayName> getDisplayNames()
- {
- if (displayName == null)
- {
- displayName = new ArrayList<DisplayNameType>();
- }
- return displayName;
- }
-
- public DisplayName addDisplayName(String lang)
- {
- DisplayNameType d = new DisplayNameType();
- d.setLang(lang);
- if (getDisplayName(d.getLocale()) != null)
- {
- throw new IllegalArgumentException("DisplayName for language: "+d.getLocale()+" already defined");
- }
- getDisplayNames();
- displayName.add(d);
- return d;
- }
-
- public String getListenerClass()
- {
- return listenerClass;
- }
-
- public void setListenerClass(String value)
- {
- listenerClass = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
deleted file mode 100644
index b3edf02..0000000
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet30/impl/ObjectFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.container.om.portlet30.impl;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-/**
- * This object contains factory methods for each Java content interface and Java element interface generated in the
- * org.apache.pluto.descriptors.portlet30 package. <p>An ObjectFactory allows you to programatically construct new
- * instances of the Java representation for XML content. The Java representation of XML content can consist of schema
- * derived interfaces and classes representing the binding of schema type definitions, element declarations and model
- * groups. Factory methods for each of these are provided in this class.
- *
- * @version $Id$
- */
-@XmlRegistry
-public class ObjectFactory
-{
- private final static QName _PortletApp_QNAME = new QName("http://xmlns.jcp.org/xml/ns/portlet",
- "portlet-app");
-
- public ObjectFactory()
- {
- }
-
- public PortletAppType createPortletApp()
- {
- return new PortletAppType();
- }
-
- @XmlElementDecl(namespace = "http://xmlns.jcp.org/xml/ns/portlet", name = "portlet-app")
- public JAXBElement<PortletAppType> createPortletApp(PortletAppType value)
- {
- return new JAXBElement<PortletAppType>(_PortletApp_QNAME, PortletAppType.class, null, value);
- }
-}