portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [16/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.
Date Fri, 27 Nov 2015 12:37:57 GMT
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.


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/bf15b331
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/bf15b331
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/bf15b331

Branch: refs/heads/V3Prototype
Commit: bf15b331ee77a3aa5956f1a4ddddac3a70d41b0d
Parents: 4bd6c63
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Mon Oct 26 11:03:14 2015 +0100
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Mon Oct 26 11:06:49 2015 +0100

----------------------------------------------------------------------
 .../container/om/portlet/CustomPortletMode.java |   62 +-
 .../container/om/portlet/CustomWindowState.java |   56 +-
 .../pluto/container/om/portlet/Description.java |   57 +-
 .../container/om/portlet/EventDefinition.java   |   80 +-
 .../om/portlet/EventDefinitionReference.java    |   51 +-
 .../pluto/container/om/portlet/Filter.java      |   84 +-
 .../pluto/container/om/portlet/InitParam.java   |   62 +-
 .../pluto/container/om/portlet/Listener.java    |   65 +-
 .../portlet/PortletApplicationDefinition.java   |   98 +-
 .../container/om/portlet/PortletDefinition.java |  162 +-
 .../pluto/container/om/portlet/Preferences.java |   56 +-
 .../om/portlet/PublicRenderParameter.java       |   69 +-
 .../om/portlet/SecurityConstraint.java          |   62 +-
 .../container/om/portlet/SecurityRoleRef.java   |   62 +-
 .../pluto/container/om/portlet/Supports.java    |   59 +-
 .../container/om/portlet/UserAttribute.java     |   56 +-
 .../om/portlet/UserDataConstraint.java          |   64 +-
 pluto-container/pom.xml                         |  329 ++--
 .../impl/AbstractPortletConfigImpl.java         |    4 +-
 .../impl/PortletAppDescriptorServiceImpl.java   |  388 +---
 .../om/portlet/impl/ConfigurationHolder.java    |  190 ++
 .../om/portlet/impl/ConfigurationProcessor.java |  161 ++
 .../impl/ContainerRuntimeOptionImpl.java        |   81 +
 .../om/portlet/impl/CustomPortletModeImpl.java  |  124 ++
 .../om/portlet/impl/CustomWindowStateImpl.java  |  104 ++
 .../om/portlet/impl/DescriptionImpl.java        |  100 ++
 .../om/portlet/impl/DisplayNameImpl.java        |   95 +
 .../om/portlet/impl/EventDefinitionImpl.java    |  179 ++
 .../impl/EventDefinitionReferenceImpl.java      |   70 +
 .../container/om/portlet/impl/FilterImpl.java   |  194 ++
 .../om/portlet/impl/FilterMappingImpl.java      |   78 +
 .../om/portlet/impl/InitParamImpl.java          |  118 ++
 .../impl/JSR168ConfigurationProcessor.java      |  564 ++++++
 .../impl/JSR286ConfigurationProcessor.java      |  895 ++++++++++
 .../impl/JSR362ConfigurationProcessor.java      |  895 ++++++++++
 .../container/om/portlet/impl/ListenerImpl.java |  141 ++
 .../impl/PortletApplicationDefinitionImpl.java  |  489 ++++++
 .../om/portlet/impl/PortletDefinitionImpl.java  |  488 +++++
 .../om/portlet/impl/PortletInfoImpl.java        |  106 ++
 .../om/portlet/impl/PreferenceImpl.java         |  104 ++
 .../om/portlet/impl/PreferencesImpl.java        |  102 ++
 .../portlet/impl/PublicRenderParameterImpl.java |  130 ++
 .../om/portlet/impl/SecurityConstraintImpl.java |  117 ++
 .../om/portlet/impl/SecurityRoleRefImpl.java    |  115 ++
 .../container/om/portlet/impl/SupportsImpl.java |  105 ++
 .../om/portlet/impl/UserAttributeImpl.java      |   97 +
 .../om/portlet/impl/UserDataConstraintImpl.java |   97 +
 .../impl/ContainerRuntimeOptionType.java        |   60 -
 .../portlet10/impl/CustomPortletModeType.java   |   58 -
 .../portlet10/impl/CustomWindowStateType.java   |   58 -
 .../om/portlet10/impl/DescriptionType.java      |   58 -
 .../om/portlet10/impl/DisplayNameType.java      |   61 -
 .../om/portlet10/impl/InitParamType.java        |   62 -
 .../om/portlet10/impl/ObjectFactory.java        |   53 -
 .../om/portlet10/impl/PortletAppType.java       |  471 -----
 .../portlet10/impl/PortletCollectionType.java   |   54 -
 .../om/portlet10/impl/PortletInfoType.java      |   60 -
 .../portlet10/impl/PortletPreferencesType.java  |   54 -
 .../om/portlet10/impl/PortletType.java          |   97 -
 .../om/portlet10/impl/PreferenceType.java       |   61 -
 .../portlet10/impl/SecurityConstraintType.java  |   58 -
 .../om/portlet10/impl/SecurityRoleRefType.java  |   66 -
 .../om/portlet10/impl/SupportsType.java         |   59 -
 .../om/portlet10/impl/UserAttributeType.java    |   59 -
 .../portlet10/impl/UserDataConstraintType.java  |   58 -
 .../om/portlet10/impl/package-info.java         |   21 -
 .../impl/ContainerRuntimeOptionType.java        |   87 -
 .../portlet20/impl/CustomPortletModeType.java   |  121 --
 .../portlet20/impl/CustomWindowStateType.java   |  107 --
 .../om/portlet20/impl/DescriptionType.java      |  120 --
 .../om/portlet20/impl/DisplayNameType.java      |  122 --
 .../impl/EventDefinitionReferenceType.java      |   85 -
 .../om/portlet20/impl/EventDefinitionType.java  |  161 --
 .../om/portlet20/impl/FilterMappingType.java    |   88 -
 .../container/om/portlet20/impl/FilterType.java |  214 ---
 .../om/portlet20/impl/InitParamType.java        |  121 --
 .../om/portlet20/impl/ListenerType.java         |  142 --
 .../om/portlet20/impl/ObjectFactory.java        |   53 -
 .../om/portlet20/impl/PortletAppType.java       |  551 ------
 .../portlet20/impl/PortletCollectionType.java   |   64 -
 .../om/portlet20/impl/PortletInfoType.java      |   92 -
 .../portlet20/impl/PortletPreferencesType.java  |  101 --
 .../om/portlet20/impl/PortletType.java          |  521 ------
 .../om/portlet20/impl/PreferenceType.java       |   98 --
 .../impl/PublicRenderParameterType.java         |  156 --
 .../portlet20/impl/SecurityConstraintType.java  |  128 --
 .../om/portlet20/impl/SecurityRoleRefType.java  |  125 --
 .../om/portlet20/impl/SupportsType.java         |  118 --
 .../om/portlet20/impl/UserAttributeType.java    |  108 --
 .../portlet20/impl/UserDataConstraintType.java  |  107 --
 .../om/portlet20/impl/package-info.java         |   21 -
 .../impl/ContainerRuntimeOptionType.java        |   87 -
 .../portlet30/impl/CustomPortletModeType.java   |  121 --
 .../portlet30/impl/CustomWindowStateType.java   |  107 --
 .../om/portlet30/impl/DescriptionType.java      |  120 --
 .../om/portlet30/impl/DisplayNameType.java      |  122 --
 .../impl/EventDefinitionReferenceType.java      |   85 -
 .../om/portlet30/impl/EventDefinitionType.java  |  161 --
 .../om/portlet30/impl/FilterMappingType.java    |   88 -
 .../container/om/portlet30/impl/FilterType.java |  214 ---
 .../om/portlet30/impl/InitParamType.java        |  121 --
 .../om/portlet30/impl/ListenerType.java         |  142 --
 .../om/portlet30/impl/ObjectFactory.java        |   53 -
 .../om/portlet30/impl/PortletAppType.java       |  551 ------
 .../portlet30/impl/PortletCollectionType.java   |   64 -
 .../om/portlet30/impl/PortletInfoType.java      |   92 -
 .../portlet30/impl/PortletPreferencesType.java  |  101 --
 .../om/portlet30/impl/PortletType.java          |  521 ------
 .../om/portlet30/impl/PreferenceType.java       |   98 --
 .../impl/PublicRenderParameterType.java         |  156 --
 .../portlet30/impl/SecurityConstraintType.java  |  128 --
 .../om/portlet30/impl/SecurityRoleRefType.java  |  125 --
 .../om/portlet30/impl/SupportsType.java         |  118 --
 .../om/portlet30/impl/UserAttributeType.java    |  108 --
 .../portlet30/impl/UserDataConstraintType.java  |  107 --
 .../om/portlet30/impl/package-info.java         |   21 -
 .../pluto/container/impl/portlet-app_1_0.xsd    | 1259 +++++++------
 .../pluto/container/impl/portlet-app_2_0.xsd    | 1660 +++++++++---------
 .../pluto/container/impl/portlet-app_3_0.xsd    |    2 +-
 .../apache/pluto/container/impl/web-app_2_3.dtd | 1063 -----------
 .../pluto/container/impl/BaseJaxbTestSuite.java |   36 +
 .../impl/JaxBDescriptorServiceImplTest.java     |  468 -----
 .../container/impl/JaxbReadTest168Gen.java      |   98 ++
 .../pluto/container/impl/JaxbReadTest168NC.java |  101 ++
 .../container/impl/JaxbReadTest286Gen.java      |  138 ++
 .../pluto/container/impl/JaxbReadTest286NC.java |   99 ++
 .../container/impl/JaxbReadTest362Gen.java      |  121 ++
 .../om/portlet/impl/fixtures/TestEventType.java |   28 +
 .../om/portlet/impl/fixtures/TestFilter.java    |   50 +
 .../om/portlet/impl/fixtures/TestListener.java  |   28 +
 .../om/portlet/impl/fixtures/TestPortlet.java   |   64 +
 .../impl/fixtures/TestPreferencesValidator.java |   37 +
 .../jsr168/CustomPortletMode168ImplTest.java    |  128 ++
 .../jsr168/CustomWindowState168ImplTest.java    |  128 ++
 ...PortletApplicationDefinition168ImplTest.java |  113 ++
 .../jsr168/PortletDefinition168ImplTest.java    |  426 +++++
 .../jsr168/SecurityConstraint168ImplTest.java   |  122 ++
 .../impl/jsr168/UserAttribute168ImplTest.java   |  133 ++
 .../jsr168/UserDataConstraint168ImplTest.java   |  105 ++
 .../jsr286/CustomPortletMode286ImplTest.java    |  140 ++
 .../jsr286/CustomWindowState286ImplTest.java    |  128 ++
 ...PortletApplicationDefinition286ImplTest.java |  652 +++++++
 .../jsr286/PortletDefinition286ImplTest.java    |  538 ++++++
 .../jsr286/SecurityConstraint286ImplTest.java   |  122 ++
 ...tandAloneContainerRuntimeOptionImplTest.java |   98 ++
 .../impl/jsr286/UserAttribute286ImplTest.java   |  133 ++
 .../jsr286/UserDataConstraint286ImplTest.java   |  105 ++
 .../jsr362/CustomPortletMode362ImplTest.java    |  140 ++
 .../jsr362/CustomWindowState362ImplTest.java    |  128 ++
 ...PortletApplicationDefinition362ImplTest.java |  652 +++++++
 .../jsr362/PortletDefinition362ImplTest.java    |  538 ++++++
 .../jsr362/SecurityConstraint362ImplTest.java   |  122 ++
 ...tandAloneContainerRuntimeOptionImplTest.java |   98 ++
 .../impl/jsr362/UserAttribute362ImplTest.java   |  133 ++
 .../jsr362/UserDataConstraint362ImplTest.java   |  105 ++
 .../src/test/resources/META-INF/beans.xml       |   10 +
 .../container/om/portlet/portlet-app_2_0.xml    |  121 ++
 .../om/portlet/portlet168Generated.xml          |   80 +
 .../container/om/portlet/portlet168NoCache.xml  |   53 +
 .../om/portlet/portlet286Generated.xml          |  154 ++
 .../container/om/portlet/portlet286NoCache.xml  |   90 +
 .../om/portlet/portlet362Generated.xml          |  156 ++
 .../container/om/portlet/webApp23simple.xml     |   23 +
 .../container/om/portlet/webApp24simple.xml     |   24 +
 .../container/om/portlet/webApp25simple.xml     |   12 +
 .../container/om/portlet/webApp30simple.xml     |   30 +
 .../container/om/portlet/webApp31simple.xml     |   22 +
 pom.xml                                         |    6 +-
 168 files changed, 14819 insertions(+), 12816 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
index 6e541d6..0a05e91 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomPortletMode.java
@@ -1,32 +1,32 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface CustomPortletMode {
-
-    String getPortletMode();
-    
-	boolean isPortalManaged();
-	void setPortalManaged(boolean portalManaged);
-
-	Description getDescription(Locale locale);
-	List<? extends Description> getDescriptions();
-	Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface CustomPortletMode {
+
+    String getPortletMode();
+    
+	boolean isPortalManaged();
+	void setPortalManaged(boolean portalManaged);
+
+	Description getDescription(Locale locale);
+	List<Description> getDescriptions();
+	void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
index 2d3ba3b..391b587 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/CustomWindowState.java
@@ -1,29 +1,29 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface CustomWindowState {
-
-    String getWindowState();
-
-    Description getDescription(Locale locale);
-	List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface CustomWindowState {
+
+    String getWindowState();
+
+    Description getDescription(Locale locale);
+	 List<Description> getDescriptions();
+    void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
index ff5f38f..9f3294c 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Description.java
@@ -1,29 +1,30 @@
-/*
- * 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.portlet;
-
-import java.util.Locale;
-
-public interface Description {
-
-    String getLang();
-    
-	String getDescription();
-	void setDescription(String description);
-
-	Locale getLocale();
+/*
+ * 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.portlet;
+
+import java.util.Locale;
+
+public interface Description {
+
+    String getLang();
+   void setLang(String lang);
+    
+	String getDescription();
+	void setDescription(String description);
+
+	Locale getLocale();
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
index 601dfdb..040fd8f 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinition.java
@@ -1,40 +1,42 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.namespace.QName;
-
-public interface EventDefinition
-{
-    QName getQName();
-    String getName();
-    
-	List<QName> getAliases();
-	void addAlias(QName qName);
-
-	Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
-	
-	String getValueType();
-	void setValueType(String valueType);
-
-	QName getQualifiedName(String defaultNamespace);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.xml.namespace.QName;
+
+public interface EventDefinition
+{
+    QName getQName();
+   void setQName(QName qn);
+    
+	List<QName> getAliases();
+	void addAlias(QName qName);
+
+	Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
+   DisplayName getDisplayName(Locale locale);
+   List<DisplayName> getDisplayNames();
+   void addDisplayName(DisplayName desc);
+	
+	String getValueType();
+	void setValueType(String valueType);
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
index f6ca059..db6d8ff 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/EventDefinitionReference.java
@@ -1,28 +1,25 @@
-/*
- * 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.portlet;
-
-import javax.xml.namespace.QName;
-
-public interface EventDefinitionReference {
-
-	QName getQName();
-
-	String getName();	
-	
-	QName getQualifiedName(String defaultNamespace);	
+/*
+ * 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.portlet;
+
+import javax.xml.namespace.QName;
+
+public interface EventDefinitionReference {
+
+   QName getQualifiedName();	
+	void setQualifiedName(QName qn);	
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
index 95e169a..d03f1be 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Filter.java
@@ -1,43 +1,43 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface Filter {
-
-    String getFilterName();
-
-    Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
-
-	DisplayName getDisplayName(Locale locale);
-	List<? extends DisplayName> getDisplayNames();
-	DisplayName addDisplayName(String lang);
-
-	String getFilterClass();
-	void setFilterClass(String filterClass);
-
-	InitParam getInitParam(String paramName);
-	List<? extends InitParam> getInitParams();
-	InitParam addInitParam(String paramName);
-
-	List<String> getLifecycles();
-	void addLifecycle(String lifecycle);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface Filter {
+
+    String getFilterName();
+
+    Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
+
+	DisplayName getDisplayName(Locale locale);
+   List<DisplayName> getDisplayNames();
+   void addDisplayName(DisplayName dn);
+
+	String getFilterClass();
+	void setFilterClass(String filterClass);
+
+	InitParam getInitParam(String paramName);
+   List<InitParam> getInitParams();
+   void addInitParam(InitParam ip);
+
+	List<String> getLifecycles();
+	void addLifecycle(String lifecycle);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
index b9669ad..a331b58 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/InitParam.java
@@ -1,32 +1,32 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface InitParam {
-
-	String getParamName();
-
-	String getParamValue();
-	void setParamValue(String paramValue);
-
-	Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface InitParam {
+
+   String getParamName();
+
+   String getParamValue();
+   void setParamValue(String paramValue);
+
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
index 0d4a9bb..c1e7fdf 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Listener.java
@@ -1,33 +1,34 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface Listener {
-    
-    String getListenerClass();
-
-    Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
-	
-	DisplayName getDisplayName(Locale locale);
-    List<? extends DisplayName> getDisplayNames();
-    DisplayName addDisplayName(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface Listener {
+    
+   String getListenerClass();
+   void setListenerClass(String cls);
+
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
+   
+   DisplayName getDisplayName(Locale locale);
+   List<DisplayName> getDisplayNames();
+   void addDisplayName(DisplayName dispName);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
index 8f98611..80b3d76 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletApplicationDefinition.java
@@ -24,68 +24,70 @@ import javax.xml.namespace.QName;
 
 public interface PortletApplicationDefinition {
 
-    String JSR_168_VERSION = "1.0";
-    String JSR_286_VERSION = "2.0";
-    String JSR_362_VERSION = "3.0";
+   String JSR_168_VERSION = "1.0";
+   String JSR_286_VERSION = "2.0";
+   String JSR_362_VERSION = "3.0";
 
-    String getName();
-    void setName(String name);
+   String getName();
+   void setName(String name);
+
+   String getId();
+   void setId(String id);
     
-    String getContextPath();
-    void setContextPath(String contextPath);
+   String getContextPath();
+   void setContextPath(String contextPath);
     
-    PortletDefinition getPortlet(String portletName);
-	List<? extends PortletDefinition> getPortlets();
-	PortletDefinition addPortlet(String name);
-	
-	List<? extends EventDefinition> getEventDefinitions();
-	EventDefinition addEventDefinition(String name);
-    EventDefinition addEventDefinition(QName qname);
+   PortletDefinition getPortlet(String portletName);
+   List<PortletDefinition> getPortlets();
+   void addPortlet(PortletDefinition pd);
+   
+   List<EventDefinition> getEventDefinitions();
+   EventDefinition getEventDefinition(QName qn);
+   void addEventDefinition(EventDefinition ed);
 
-	PublicRenderParameter getPublicRenderParameter(String identifier);
-	List<? extends PublicRenderParameter> getPublicRenderParameters();
-	PublicRenderParameter addPublicRenderParameter(String name, String identifier);
-    PublicRenderParameter addPublicRenderParameter(QName qname, String identifier);
+   PublicRenderParameter getPublicRenderParameter(String identifier);
+   List<PublicRenderParameter> getPublicRenderParameters();
+   void addPublicRenderParameter(PublicRenderParameter prp);
 
-	String getVersion();
-	void setVersion(String version);
+   String getVersion();
+   void setVersion(String version);
 
-	CustomPortletMode getCustomPortletMode(String name);
-	List<? extends CustomPortletMode> getCustomPortletModes();
-	CustomPortletMode addCustomPortletMode(String name);
+   CustomPortletMode getCustomPortletMode(String name);
+   List<CustomPortletMode> getCustomPortletModes();
+   void addCustomPortletMode(CustomPortletMode cpm);
 
-    CustomWindowState getCustomWindowState(String name);
-	List<? extends CustomWindowState> getCustomWindowStates();
-	CustomWindowState addCustomWindowState(String name);
+   CustomWindowState getCustomWindowState(String name);
+   List<CustomWindowState> getCustomWindowStates();
+   void addCustomWindowState(CustomWindowState cws);
 
-	UserAttribute getUserAttribute(String name);
-	List<? extends UserAttribute> getUserAttributes();
-	UserAttribute addUserAttribute(String name);
+   UserAttribute getUserAttribute(String name);
+   List<UserAttribute> getUserAttributes();
+   void addUserAttribute(UserAttribute ua);
 
-	List<? extends SecurityConstraint> getSecurityConstraints();
-	SecurityConstraint addSecurityConstraint(String transportGuarantee);
+   List<SecurityConstraint> getSecurityConstraints();
+   void addSecurityConstraint(SecurityConstraint sc);
 
-	String getResourceBundle();
-	void setResourceBundle(String resourceBundle);
+   String getResourceBundle();
+   void setResourceBundle(String resourceBundle);
 
-	Filter getFilter(String filterName);
-	List<? extends Filter> getFilters();
-	Filter addFilter(String filterName);
+   Filter getFilter(String filterName);
+   List<Filter> getFilters();
+   void addFilter(Filter filter);
 
-	FilterMapping getFilterMapping(String filterName);
-	List<? extends FilterMapping> getFilterMappings();
-	FilterMapping addFilterMapping(String filterName);
+   FilterMapping getFilterMapping(String filterName);
+   List<FilterMapping> getFilterMappings();
+   void addFilterMapping(FilterMapping fm);
 
-	List<? extends Listener> getListeners();
-	Listener addListener(String listenerClass);
+   List<Listener> getListeners();
+   void addListener(Listener listener);
 
-	String getDefaultNamespace();
-	void setDefaultNamespace(String defaultNamespace);
+   String getDefaultNamespace();
+   void setDefaultNamespace(String defaultNamespace);
 
-	ContainerRuntimeOption getContainerRuntimeOption(String name);
-	List<? extends ContainerRuntimeOption> getContainerRuntimeOptions();
-	ContainerRuntimeOption addContainerRuntimeOption(String name);
+   ContainerRuntimeOption getContainerRuntimeOption(String name);
+   List<ContainerRuntimeOption> getContainerRuntimeOptions();
+   void addContainerRuntimeOption(ContainerRuntimeOption cro);
 
-    Map<Locale, String> getLocaleEncodingMappings();
-    void addLocaleEncodingMapping(Locale locale, String encoding);
+   Map<Locale, String> getLocaleEncodingMappings();
+   void addLocaleEncodingMapping(Locale locale, String encoding);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
index 2a17249..8d3250c 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PortletDefinition.java
@@ -1,83 +1,81 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.namespace.QName;
-
-public interface PortletDefinition {
-    
-    String getPortletName();
-
-    PortletApplicationDefinition getApplication();
-
-    InitParam getInitParam(String paramName);
-	List<? extends InitParam> getInitParams();
-	InitParam addInitParam(String paramName);
-	
-	String getPortletClass();
-	void setPortletClass(String portletClass);
-
-	PortletInfo getPortletInfo();
-
-	Preferences getPortletPreferences();
-
-    List<? extends EventDefinitionReference> getSupportedProcessingEvents();
-    EventDefinitionReference addSupportedProcessingEvent(QName qname);
-    EventDefinitionReference addSupportedProcessingEvent(String name);
-    
-    List<? extends EventDefinitionReference> getSupportedPublishingEvents();
-    EventDefinitionReference addSupportedPublishingEvent(QName qname);
-    EventDefinitionReference addSupportedPublishingEvent(String name);
-
-	List<String> getSupportedPublicRenderParameters();
-	void addSupportedPublicRenderParameter(String identifier);
-
-	String getResourceBundle();
-	void setResourceBundle(String resourceBundle);
-
-	SecurityRoleRef getSecurityRoleRef(String roleName);
-	List<? extends SecurityRoleRef> getSecurityRoleRefs();
-	SecurityRoleRef addSecurityRoleRef(String roleName);
-
-	Supports getSupports(String mimeType);
-	List<? extends Supports> getSupports();
-	Supports addSupports(String mimeType);
-
-	Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
-
-	DisplayName getDisplayName(Locale locale);
-    List<? extends DisplayName> getDisplayNames();
-    DisplayName addDisplayName(String lang);
-
-	List<String> getSupportedLocales();
-	void addSupportedLocale(String lang);
-
-	int getExpirationCache();
-    void setExpirationCache(int expirationCache);
-
-	String getCacheScope();
-	void setCacheScope(String cacheScope);
-
-	ContainerRuntimeOption getContainerRuntimeOption(String name);
-	List<? extends ContainerRuntimeOption> getContainerRuntimeOptions();
-	ContainerRuntimeOption addContainerRuntimeOption(String name);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface PortletDefinition {
+    
+   String getPortletName();
+
+   PortletApplicationDefinition getApplication();
+
+   InitParam getInitParam(String paramName);
+   List<InitParam> getInitParams();
+   void addInitParam(InitParam ip);
+   
+   String getPortletClass();
+   void setPortletClass(String portletClass);
+
+   PortletInfo getPortletInfo();
+   void setPortletInfo(PortletInfo info);
+
+   Preferences getPortletPreferences();
+   void setPortletPreferences(Preferences prefs);
+
+   List<EventDefinitionReference> getSupportedProcessingEvents();
+   void addSupportedProcessingEvent(EventDefinitionReference edr);
+    
+   List<EventDefinitionReference> getSupportedPublishingEvents();
+   void addSupportedPublishingEvent(EventDefinitionReference edr);
+
+   List<String> getSupportedPublicRenderParameters();
+   void addSupportedPublicRenderParameter(String identifier);
+
+   String getResourceBundle();
+   void setResourceBundle(String resourceBundle);
+
+   SecurityRoleRef getSecurityRoleRef(String roleName);
+   List<SecurityRoleRef> getSecurityRoleRefs();
+   void addSecurityRoleRef(SecurityRoleRef srr);
+
+   Supports getSupports(String mimeType);
+   List<Supports> getSupports();
+   void addSupports(Supports supps);
+
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
+
+   DisplayName getDisplayName(Locale locale);
+   List<DisplayName> getDisplayNames();
+   void addDisplayName(DisplayName dn);
+
+   List<String> getSupportedLocales();
+   void addSupportedLocale(String lang);
+
+   int getExpirationCache();
+   void setExpirationCache(int expirationCache);
+
+   String getCacheScope();
+   void setCacheScope(String cacheScope);
+
+   ContainerRuntimeOption getContainerRuntimeOption(String name);
+   List<ContainerRuntimeOption> getContainerRuntimeOptions();
+   void addContainerRuntimeOption(ContainerRuntimeOption cro);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
index 6c05fdd..25e8393 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Preferences.java
@@ -1,29 +1,29 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-
-public interface Preferences {
-
-    Preference getPortletPreference(String name);
-	List<? extends Preference> getPortletPreferences();
-	Preference addPreference(String name);
-
-	String getPreferencesValidator();
-	void setPreferencesValidator(String preferencesValidator);
+/*
+ * 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.portlet;
+
+import java.util.List;
+
+public interface Preferences {
+
+   Preference getPortletPreference(String name);
+   List<Preference> getPortletPreferences();
+   void addPreference(Preference pref);
+
+   String getPreferencesValidator();
+   void setPreferencesValidator(String preferencesValidator);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
index 711a8df..7c0297e 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/PublicRenderParameter.java
@@ -1,36 +1,35 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-import javax.xml.namespace.QName;
-
-public interface PublicRenderParameter {
-
-    QName getQName();
-    String getName();
-    String getIdentifier();
-
-    Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
-
-	List<QName> getAliases();
-	void addAlias(QName alias);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.xml.namespace.QName;
+
+public interface PublicRenderParameter {
+
+   QName getQName();
+   String getIdentifier();
+
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
+
+   List<QName> getAliases();
+   void addAlias(QName alias);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
index 3aa1e23..caa9e0f 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityConstraint.java
@@ -1,32 +1,32 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface SecurityConstraint {
-    
-    UserDataConstraint getUserDataConstraint();
-
-    DisplayName getDisplayName(Locale locale);
-    List<? extends DisplayName> getDisplayNames();
-    DisplayName addDisplayName(String lang);
-	
-    List<String> getPortletNames();
-    void addPortletName(String portletName);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface SecurityConstraint {
+    
+    UserDataConstraint getUserDataConstraint();
+
+    DisplayName getDisplayName(Locale locale);
+    List<DisplayName> getDisplayNames();
+    void addDisplayName(DisplayName dispName);
+	
+    List<String> getPortletNames();
+    void addPortletName(String portletName);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
index 0977dc0..64d30b7 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/SecurityRoleRef.java
@@ -1,32 +1,32 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface SecurityRoleRef {
-
-	String getRoleName();
-
-	String getRoleLink();
-	void setRoleLink(String roleLink);
-
-	Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface SecurityRoleRef {
+
+   String getRoleName();
+
+   String getRoleLink();
+   void setRoleLink(String roleLink);
+
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
index e5f55d5..3b6ca55 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/Supports.java
@@ -1,30 +1,31 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-
-public interface Supports {
-
-	String getMimeType();
-
-	List<String> getPortletModes();
-	void addPortletMode(String portletMode);
-
-	List<String> getWindowStates();
-    void addWindowState(String windowState);
+/*
+ * 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.portlet;
+
+import java.util.List;
+
+public interface Supports {
+
+   String getMimeType();
+   void setMimeType(String mt);
+
+   List<String> getPortletModes();
+   void addPortletMode(String portletMode);
+
+   List<String> getWindowStates();
+   void addWindowState(String windowState);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
index 97e0d55..fe9ae34 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserAttribute.java
@@ -1,29 +1,29 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface UserAttribute {
-    
-    String getName();
-
-    Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface UserAttribute {
+    
+    String getName();
+
+    Description getDescription(Locale locale);
+    List<Description> getDescriptions();
+    void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
----------------------------------------------------------------------
diff --git a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
index 36f858a..b0c1028 100644
--- a/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
+++ b/pluto-container-api/src/main/java/org/apache/pluto/container/om/portlet/UserDataConstraint.java
@@ -1,33 +1,33 @@
-/*
- * 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.portlet;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface UserDataConstraint {
-
-	String NONE = "NONE";
-	String INTEGRAL = "INTEGRAL";
-	String CONFIDENTIAL = "CONFIDENTIAL";
-
-    String getTransportGuarantee();
-    
-	Description getDescription(Locale locale);
-    List<? extends Description> getDescriptions();
-    Description addDescription(String lang);
+/*
+ * 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.portlet;
+
+import java.util.List;
+import java.util.Locale;
+
+public interface UserDataConstraint {
+
+   String NONE = "NONE";
+   String INTEGRAL = "INTEGRAL";
+   String CONFIDENTIAL = "CONFIDENTIAL";
+
+   String getTransportGuarantee();
+    
+   Description getDescription(Locale locale);
+   List<Description> getDescriptions();
+   void addDescription(Description desc);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/pom.xml
----------------------------------------------------------------------
diff --git a/pluto-container/pom.xml b/pluto-container/pom.xml
index 437a0f3..26ed23b 100644
--- a/pluto-container/pom.xml
+++ b/pluto-container/pom.xml
@@ -1,166 +1,187 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+>
 
-   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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.portals.pluto</groupId>
-    <artifactId>pluto</artifactId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>pluto-container</artifactId>
-  <packaging>bundle</packaging>
-  <name>Apache Pluto Portlet Container</name>
-  <description>The Apache Pluto portlet container.</description>
-
-  <dependencies>
-    <dependency>
+   <modelVersion>4.0.0</modelVersion>
+   <parent>
       <groupId>org.apache.portals.pluto</groupId>
-      <artifactId>pluto-container-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Other Support Libraries =========================================== -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>compile</scope>
-    </dependency>
+      <artifactId>pluto</artifactId>
+      <version>3.0-SNAPSHOT</version>
+   </parent>
 
-    <!-- Specification Libraries =========================================== -->
-    <dependency>
-      <groupId>org.apache.portals.pluto</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
+   <artifactId>pluto-container</artifactId>
+   <packaging>bundle</packaging>
+   <name>Apache Pluto Portlet Container</name>
+   <description>The Apache Pluto portlet container.</description>
 
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
+   <dependencies>
+      <dependency>
+         <groupId>org.apache.portals.pluto</groupId>
+         <artifactId>pluto-container-api</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
 
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <scope>${dependency.scope}</scope>
-    </dependency>
+      <!-- Other Support Libraries =========================================== -->
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-api</artifactId>
+         <scope>compile</scope>
+      </dependency>
 
-    <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <scope>${dependency.scope}</scope>
-    </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <scope>${dependency.scope}</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+      <!-- Specification Libraries =========================================== -->
+      <dependency>
+         <groupId>org.apache.portals.pluto</groupId>
+         <artifactId>portlet-api</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
 
-    <!--  CCPP Libraries -->
-    <dependency>
-      <groupId>javax.ccpp</groupId>
-      <artifactId>ccpp</artifactId>
-      <scope>provided</scope>
-    </dependency>
+      <dependency>
+         <groupId>org.apache.tomcat</groupId>
+         <artifactId>tomcat-servlet-api</artifactId>
+         <scope>provided</scope>
+      </dependency>
 
-    <!-- Testing Libraries ================================================= -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock-cglib</artifactId>
-    </dependency>
-  </dependencies>
+      <!-- CCPP Libraries -->
+      <dependency>
+         <groupId>javax.ccpp</groupId>
+         <artifactId>ccpp</artifactId>
+         <scope>provided</scope>
+      </dependency>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
+      <!-- Testing Libraries ================================================= -->
+      <dependency>
+         <groupId>org.slf4j</groupId>
+         <artifactId>slf4j-jdk14</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>jmock</groupId>
+         <artifactId>jmock</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>jmock</groupId>
+         <artifactId>jmock-cglib</artifactId>
+      </dependency>
+   </dependencies>
 
-    <plugins>
-      <!-- Surefire Plugin: Exec Tests ===================================== -->
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/PlutoTestCase.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd</exclude>
-            <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd</exclude>
-            <exclude>src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>org.apache.pluto.container.impl,
-              org.apache.pluto.container.om.portlet.impl,
-              org.apache.pluto.container.om.portlet10.impl,
-              org.apache.pluto.container.util
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+   <build>
+<!--   
+      <resources>
+         <resource>
+            <directory>src/main/resources</directory>
+            <filtering>true</filtering>
+         </resource>
+      </resources>
+      <testResources>
+         <testResource>
+            <directory>src/test/resources</directory>
+            <filtering>true</filtering>
+         </testResource>
+      </testResources>
+ --> 
+      <plugins>
+         <!-- Surefire Plugin: Exec Tests ===================================== -->
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <includes>
+                  <include>**/*ImplTest.java</include>
+                  <include>**/*TestSuite.java</include>
+               </includes>
+               <excludes>
+                  <exclude>**/PlutoTestCase.java</exclude>
+               </excludes>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.rat</groupId>
+            <artifactId>apache-rat-plugin</artifactId>
+            <configuration>
+               <excludes>
+                  <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_1_0.xsd</exclude>
+                  <exclude>src/main/resources/org/apache/pluto/container/impl/portlet-app_2_0.xsd</exclude>
+                  <exclude>src/main/resources/org/apache/pluto/container/impl/web-app_2_3.dtd</exclude>
+               </excludes>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <configuration>
+               <instructions>
+                  <Export-Package>org.apache.pluto.container.impl,
+                     org.apache.pluto.container.om.portlet.impl,
+                     org.apache.pluto.container.util
+                  </Export-Package>
+               </instructions>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.jvnet.jaxb2.maven2</groupId>
+            <artifactId>maven-jaxb2-plugin</artifactId>
+            <version>0.12.3</version>
+            <executions>
+               <execution>
+                  <id>portlet1-generate</id>
+                  <goals>
+                     <goal>generate</goal>
+                  </goals>
+                  <configuration>
+                     <schemaDirectory>src/main/resources/org/apache/pluto/container/impl</schemaDirectory>
+                     <schemaIncludes>
+                        <include>portlet-app_1_0.xsd</include>
+                     </schemaIncludes>
+                     <generatePackage>org.apache.pluto.container.om.portlet10.impl</generatePackage>
+                     <generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>portlet2-generate</id>
+                  <goals>
+                     <goal>generate</goal>
+                  </goals>
+                  <configuration>
+                     <schemaDirectory>src/main/resources/org/apache/pluto/container/impl</schemaDirectory>
+                     <schemaIncludes>
+                        <include>portlet-app_2_0.xsd</include>
+                     </schemaIncludes>
+                     <generatePackage>org.apache.pluto.container.om.portlet20.impl</generatePackage>
+                     <generateDirectory>${project.build.directory}/generated-sources/xjc2</generateDirectory>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>portlet3-generate</id>
+                  <goals>
+                     <goal>generate</goal>
+                  </goals>
+                  <configuration>
+                     <schemaDirectory>src/main/resources/org/apache/pluto/container/impl</schemaDirectory>
+                     <schemaIncludes>
+                        <include>portlet-app_3_0.xsd</include>
+                     </schemaIncludes>
+                     <generatePackage>org.apache.pluto.container.om.portlet30.impl</generatePackage>
+                     <generateDirectory>${project.build.directory}/generated-sources/xjc3</generateDirectory>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/bf15b331/pluto-container/src/main/java/org/apache/pluto/container/impl/AbstractPortletConfigImpl.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/impl/AbstractPortletConfigImpl.java b/pluto-container/src/main/java/org/apache/pluto/container/impl/AbstractPortletConfigImpl.java
index b9c0556..28e7bb6 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/impl/AbstractPortletConfigImpl.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/impl/AbstractPortletConfigImpl.java
@@ -135,7 +135,7 @@ public abstract class AbstractPortletConfigImpl implements PortletConfig
 	    ArrayList<QName> qnameList = new ArrayList<QName>();
         for (EventDefinitionReference ref : portlet.getSupportedProcessingEvents())
         {
-            QName name = ref.getQualifiedName(portlet.getApplication().getDefaultNamespace());
+            QName name = ref.getQualifiedName();
             if (name == null)
             {
                 continue;
@@ -149,7 +149,7 @@ public abstract class AbstractPortletConfigImpl implements PortletConfig
         ArrayList<QName> qnameList = new ArrayList<QName>();
         for (EventDefinitionReference ref : portlet.getSupportedPublishingEvents())
         {
-            QName name = ref.getQualifiedName(portlet.getApplication().getDefaultNamespace());
+            QName name = ref.getQualifiedName();
             if (name == null)
             {
                 continue;


Mime
View raw message