Author: julien(a)jboss.com
Date: 2008-01-07 19:27:36 -0500 (Mon, 07 Jan 2008)
New Revision: 9449
Added:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java
Removed:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaData.java
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication10MetaData.java
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication20MetaData.java
Log:
- split PortletApplicationMetaData for use with JBossXB annotations and without
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/AbstractMetaDataTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -28,9 +28,10 @@
import org.jboss.portal.portlet.test.deployment.ValueTrimmingFilter;
import org.jboss.portal.portlet.test.metadata.factory.PortletApplicationModelFactory;
+import
org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData;
+import
org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import static org.jboss.portal.portlet.test.metadata.impl.PortletMetaDataConstants.*;
@@ -84,8 +85,8 @@
/** SchemaResolver */
resolver.addSchemaLocation(PORTLET_JSR_168_NS,
"portlet-app_1_0.xsd");
resolver.addSchemaLocation(PORTLET_JSR_286_NS,
"portlet-app_2_0.xsd");
- resolver.addClassBinding(PORTLET_JSR_286_NS,
PortletApplication20MetaData.class);
- resolver.addClassBinding(PORTLET_JSR_168_NS,
PortletApplication10MetaData.class);
+ resolver.addClassBinding(PORTLET_JSR_286_NS,
AnnotationPortletApplication20MetaData.class);
+ resolver.addClassBinding(PORTLET_JSR_168_NS,
AnnotationPortletApplication10MetaData.class);
}
catch (Exception e)
{
@@ -93,7 +94,7 @@
}
}
- protected PortletApplicationMetaData unmarshall(String file) throws JBossXBException,
SAXException, IOException
+ protected PortletApplication10MetaData unmarshall10(String file) throws
JBossXBException, SAXException, IOException
{
if (ANNOTATION_BINDING.equals(parser))
{
@@ -109,7 +110,23 @@
}
}
- private PortletApplicationMetaData unmarshallAnnotation(String file) throws
JBossXBException, SAXException,
+ protected PortletApplication20MetaData unmarshall20(String file) throws
JBossXBException, SAXException, IOException
+ {
+ if (ANNOTATION_BINDING.equals(parser))
+ {
+ return (PortletApplication20MetaData)this.unmarshallAnnotation(file);
+ }
+ else if (FACTORY_BINDING.equals(parser))
+ {
+ return (PortletApplication20MetaData)this.unmarshallWithFactory(file);
+ }
+ else
+ {
+ throw new IllegalArgumentException("Wrong parameter for parser.");
+ }
+ }
+
+ private PortletApplication10MetaData unmarshallAnnotation(String file) throws
JBossXBException, SAXException,
IOException
{
/** validate */
@@ -119,10 +136,10 @@
unmarshaller.setValidation(true);
/** unmarshal */
- return (PortletApplicationMetaData) unmarshaller.unmarshal(getPath(file),
resolver);
+ return (PortletApplication10MetaData) unmarshaller.unmarshal(getPath(file),
resolver);
}
- private PortletApplicationMetaData unmarshallWithFactory(String file) throws
JBossXBException
+ private PortletApplication10MetaData unmarshallWithFactory(String file) throws
JBossXBException
{
/** validate */
unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
@@ -132,7 +149,7 @@
PortletApplicationModelFactory factory = new PortletApplicationModelFactory();
/** unmarshal */
- return (PortletApplicationMetaData) unmarshaller.unmarshal(getStream(file), new
ValueTrimmingFilter(factory),
+ return (PortletApplication10MetaData) unmarshaller.unmarshal(getStream(file), new
ValueTrimmingFilter(factory),
null);
}
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomPortletModeTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -27,7 +27,6 @@
import org.jboss.portal.portlet.test.metadata.impl.CustomPortletModeMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -47,7 +46,7 @@
{
String xmlFile = "customPortletMode/portlet1.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -77,7 +76,7 @@
String xmlFile = "customPortletMode/portlet2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
@@ -120,7 +119,7 @@
String xmlFile = "customPortletMode/portlet1-fail.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
fail("portlet 2.0 properties are not allowed");
}
catch (Exception e)
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/CustomWindowStateTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -27,7 +27,6 @@
import org.jboss.portal.portlet.test.metadata.impl.CustomWindowStateMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -46,7 +45,7 @@
String xmlFile = "customWindowState/portlet1.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -77,7 +76,7 @@
String xmlFile = "customWindowState/portlet2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/EventTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -27,7 +27,7 @@
import javax.xml.namespace.QName;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
+import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.event.EventDefinitionMetaData;
import
org.jboss.portal.portlet.test.metadata.impl.event.EventDefinitionReferenceMetaData;
import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletMetaData;
@@ -50,7 +50,7 @@
String xmlFile = "event/portlet-event1.xml";
- unmarshall(xmlFile);
+ unmarshall10(xmlFile);
fail();
}
catch (Exception e)
@@ -67,7 +67,7 @@
String xmlFile = "event/portlet-event2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
@@ -127,7 +127,7 @@
String xmlFile = "event/portlet-event2-fail.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertEquals("2.0", md.getVersion());
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/FilterTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -25,7 +25,6 @@
import java.util.Locale;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.common.InitParamMetaData;
import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
@@ -44,7 +43,7 @@
{
try
{
- unmarshall("filter/portlet-filter1.xml");
+ unmarshall10("filter/portlet-filter1.xml");
// no filters in jsr 168
fail();
}
@@ -61,7 +60,7 @@
{
String xmlFile = "filter/portlet-filter2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/GeneralMetaDataTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -28,7 +28,6 @@
import org.jboss.portal.portlet.test.metadata.impl.ListenerMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PublicRenderParameterMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
@@ -46,7 +45,7 @@
{
try
{
- PortletApplicationMetaData md =
this.unmarshall("general/portlet1.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("general/portlet1.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -63,7 +62,7 @@
{
try
{
- PortletApplicationMetaData md =
this.unmarshall("general/portlet2.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("general/portlet2.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
@@ -80,7 +79,7 @@
{
try
{
- PortletApplicationMetaData md = (PortletApplicationMetaData)
this.unmarshall("general/portlet2-jsr286.xml");
+ PortletApplication20MetaData md =
unmarshall20("general/portlet2-jsr286.xml");
assertEquals("2.0", md.getVersion());
assertTrue(md instanceof PortletApplication20MetaData);
@@ -119,7 +118,7 @@
{
try
{
- PortletApplicationMetaData md =
unmarshall("general/portlet-app_1_0.xml");
+ PortletApplication10MetaData md =
unmarshall10("general/portlet-app_1_0.xml");
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
@@ -139,7 +138,7 @@
{
try
{
- PortletApplicationMetaData md = (PortletApplicationMetaData)
this.unmarshall("general/portlet-app_2_0.xml");
+ PortletApplication10MetaData md =
this.unmarshall10("general/portlet-app_2_0.xml");
assertEquals("2.0", md.getVersion());
assertTrue(md instanceof PortletApplication20MetaData);
}
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/PortletTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -27,7 +27,6 @@
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletMetaDataConstants;
import org.jboss.portal.portlet.test.metadata.impl.common.InitParamMetaData;
import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletCacheScopeEnum;
@@ -55,7 +54,7 @@
{
String xmlFile = "portlet/portlet1.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -210,7 +209,7 @@
{
String xmlFile = "portlet/portlet2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
@@ -366,7 +365,7 @@
{
String xmlFile = "portlet/portlet2-jsr286.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/RenderParameterTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -23,8 +23,8 @@
package org.jboss.portal.portlet.test.metadata;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PublicRenderParameterMetaData;
+import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -43,7 +43,7 @@
String xmlFile = "renderParameter/portlet2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication20MetaData md = unmarshall20(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/SecurityConstraintTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -26,7 +26,6 @@
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletMetaData;
import org.jboss.portal.portlet.test.metadata.impl.security.SecurityConstraintMetaData;
import org.jboss.portal.portlet.test.metadata.impl.security.TransportGuaranteeEnum;
@@ -48,7 +47,7 @@
String xmlFile = "security/portlet1.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
assertEquals("1.0", md.getVersion());
@@ -138,7 +137,7 @@
String xmlFile = "security/portlet2.xml";
- PortletApplicationMetaData md = unmarshall( xmlFile);
+ PortletApplication10MetaData md = unmarshall10( xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
assertEquals("2.0", md.getVersion());
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/UserAttributeTestEverythingTestCase.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -26,7 +26,6 @@
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.UserAttributeMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
@@ -46,7 +45,7 @@
{
String xmlFile = "userAttribute/portlet1.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication10MetaData);
@@ -76,7 +75,7 @@
{
String xmlFile = "userAttribute/portlet2.xml";
- PortletApplicationMetaData md = unmarshall(xmlFile);
+ PortletApplication10MetaData md = unmarshall10(xmlFile);
assertNotNull(md);
assertTrue(md instanceof PortletApplication20MetaData);
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/factory/PortletApplicationModelFactory.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -30,11 +30,12 @@
import org.jboss.portal.portlet.test.metadata.impl.CustomPortletModeMetaData;
import org.jboss.portal.portlet.test.metadata.impl.CustomWindowStateMetaData;
import org.jboss.portal.portlet.test.metadata.impl.ListenerMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.PortletApplication20MetaData;
-import org.jboss.portal.portlet.test.metadata.impl.PortletApplicationMetaData;
import org.jboss.portal.portlet.test.metadata.impl.PublicRenderParameterMetaData;
import org.jboss.portal.portlet.test.metadata.impl.UserAttributeMetaData;
+import
org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication10MetaData;
+import
org.jboss.portal.portlet.test.metadata.impl.AnnotationPortletApplication20MetaData;
+import org.jboss.portal.portlet.test.metadata.impl.PortletApplication10MetaData;
import org.jboss.portal.portlet.test.metadata.impl.common.ContainerRuntimeMetaData;
import org.jboss.portal.portlet.test.metadata.impl.common.DescribableMetaData;
import org.jboss.portal.portlet.test.metadata.impl.common.InitParamMetaData;
@@ -86,9 +87,9 @@
String id = attrs.getValue("id");
// portlet-app 2.0 or 1.0
- PortletApplicationMetaData md = PORTLET_JSR_286_NS.equals(nsURI)
- ? new PortletApplication20MetaData()
- : new PortletApplication10MetaData();
+ PortletApplication10MetaData md = PORTLET_JSR_286_NS.equals(nsURI)
+ ? new AnnotationPortletApplication20MetaData()
+ : new AnnotationPortletApplication10MetaData();
// Set portlet-app id
md.setId(id);
@@ -119,7 +120,7 @@
}
// portlet-app
- if (object instanceof PortletApplicationMetaData)
+ if (object instanceof PortletApplication10MetaData)
{
if ("portlet".equals(localName))
{
@@ -304,9 +305,9 @@
}
// portlet app
- if (parent instanceof PortletApplicationMetaData)
+ if (parent instanceof PortletApplication10MetaData)
{
- PortletApplicationMetaData md = (PortletApplicationMetaData) parent;
+ PortletApplication10MetaData md = (PortletApplication10MetaData) parent;
// add portlet
if (child instanceof PortletMetaData)
{
Added:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java
(rev 0)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication10MetaData.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.test.metadata.impl;
+
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel
Muckenhuber</a>
+ * @version $Revision$
+ */
+@XmlRootElement(name = "portlet-app")
+@XmlType(name = "portlet-appType")
+@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI =
PortletMetaDataConstants.PORTLET_JSR_168_NS, prefix = "portlet")},
+ ignoreUnresolvedFieldOrClass = false,
+ namespace = PortletMetaDataConstants.PORTLET_JSR_168_NS,
+ elementFormDefault = XmlNsForm.QUALIFIED)
+public class AnnotationPortletApplication10MetaData extends PortletApplication10MetaData
+{
+}
\ No newline at end of file
Added:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java
(rev 0)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/AnnotationPortletApplication20MetaData.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.portlet.test.metadata.impl;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel
Muckenhuber</a>
+ * @version $Revision$
+ */
+
+@XmlRootElement(name = "portlet-app")
+@XmlType(name = "portlet-appType")
+@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI =
PortletMetaDataConstants.PORTLET_JSR_286_NS, prefix = "portlet")},
+ ignoreUnresolvedFieldOrClass = false,
+ namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS,
+ elementFormDefault = XmlNsForm.QUALIFIED)
+public class AnnotationPortletApplication20MetaData extends PortletApplication20MetaData
+{
+}
\ No newline at end of file
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication10MetaData.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication10MetaData.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication10MetaData.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -33,23 +33,16 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.CustomPortletModeAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.CustomWindowStateAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.PortletListAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.UserAttributeAdapter;
-import org.jboss.portal.portlet.test.metadata.impl.common.ContainerRuntimeMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMappingMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMetaData;
import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletMetaData;
import org.jboss.portal.portlet.test.metadata.impl.security.SecurityConstraintMetaData;
-import org.jboss.xb.annotations.JBossXmlSchema;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel
Muckenhuber</a>
@@ -57,12 +50,8 @@
*/
@XmlRootElement(name = "portlet-app")
-@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI =
PortletMetaDataConstants.PORTLET_JSR_168_NS, prefix = "portlet")},
- ignoreUnresolvedFieldOrClass = false,
- namespace = PortletMetaDataConstants.PORTLET_JSR_168_NS,
- elementFormDefault = XmlNsForm.QUALIFIED)
@XmlType(name = "portlet-appType")
-public class PortletApplication10MetaData implements PortletApplicationMetaData
+public class PortletApplication10MetaData
{
/** The portlet application id. */
private String id;
@@ -220,55 +209,4 @@
}
this.securityConstraints.add(securityConstraint);
}
-
- public String getResourceBundle()
- {
- return null;
- }
-
- public ContainerRuntimeMetaData getContainerRuntimeOption(String option)
- {
- return null;
- }
-
- public Set<String> getContainerRuntimeOptionSet()
- {
- return null;
- }
-
- public URI getDefaultNamespace()
- {
- return null;
- }
-
- public List<EventDefinitionMetaData> getEvents()
- {
- return null;
- }
-
- public FilterMetaData getFilter(String filterName)
- {
- return null;
- }
-
- public Collection<FilterMetaData> getFilterCollection()
- {
- return null;
- }
-
- public Map<String, FilterMappingMetaData> getFilterMapping()
- {
- return null;
- }
-
- public List<ListenerMetaData> getListeners()
- {
- return null;
- }
-
- public List<PublicRenderParameterMetaData> getPublicRenderParameters()
- {
- return null;
- }
-
}
Modified:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication20MetaData.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication20MetaData.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplication20MetaData.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -31,63 +31,23 @@
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.ContainerRuntimeAdapter;
-import org.jboss.portal.portlet.test.metadata.impl.adapter.CustomPortletModeAdapter;
-import org.jboss.portal.portlet.test.metadata.impl.adapter.CustomWindowStateAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.FilterAdapter;
import org.jboss.portal.portlet.test.metadata.impl.adapter.FilterMappingAdapter;
-import org.jboss.portal.portlet.test.metadata.impl.adapter.PortletListAdapter;
-import org.jboss.portal.portlet.test.metadata.impl.adapter.UserAttributeAdapter;
import org.jboss.portal.portlet.test.metadata.impl.common.ContainerRuntimeMetaData;
import org.jboss.portal.portlet.test.metadata.impl.event.EventDefinitionMetaData;
import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMappingMetaData;
import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.security.SecurityConstraintMetaData;
-import org.jboss.xb.annotations.JBossXmlSchema;
/**
* @author <a href="mailto:emuckenh@redhat.com">Emanuel
Muckenhuber</a>
* @version $Revision$
*/
-
-@XmlRootElement(name = "portlet-app")
-@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI =
PortletMetaDataConstants.PORTLET_JSR_286_NS, prefix = "portlet")},
- ignoreUnresolvedFieldOrClass = false,
- namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS,
- elementFormDefault = XmlNsForm.QUALIFIED)
-@XmlType(name = "portlet-appType")
-public class PortletApplication20MetaData implements PortletApplicationMetaData
+public class PortletApplication20MetaData extends PortletApplication10MetaData
{
- /** The portlet application id */
- private String id;
-
- /** The portlet application version */
- private String version;
-
- /** A bunch of portlets */
- private Map<String, PortletMetaData> portlets;
-
- /** The user attributes */
- private Map<String, UserAttributeMetaData> userAttributes;
-
- /** The custom portlet mode */
- private Map<String, CustomPortletModeMetaData> customPortletModes;
-
- /** The custom window states */
- private Map<String, CustomWindowStateMetaData> customWindowStates;
-
- /** The security constraints */
- private List<SecurityConstraintMetaData> securityConstraints;
-
/** The resource bundle (JSR 286) */
private String resourceBundle;
@@ -112,143 +72,6 @@
/** The container runtime options */
private Map<String, ContainerRuntimeMetaData> containerRuntimeOptions;
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "version")
- public String getVersion()
- {
- return version;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- @XmlElement(name = "portlet")
- @XmlJavaTypeAdapter(PortletListAdapter.class)
- public Map<String, PortletMetaData> getPortlets()
- {
- return portlets;
- }
-
- public void setPortlets(Map<String, PortletMetaData> portlets)
- {
- this.portlets = portlets;
- }
-
- public Collection<PortletMetaData> getPortletCollection()
- {
-
- return portlets != null ? portlets.values() : null;
- }
-
- public PortletMetaData getPortlet(String portletName)
- {
- return portlets.get(portletName);
- }
-
- public void addPortlet(PortletMetaData portlet)
- {
- if(this.portlets == null)
- {
- this.portlets = new LinkedHashMap<String, PortletMetaData>();
- }
- this.portlets.put(portlet.getPortletName(), portlet);
- }
-
- @XmlElement(name = "user-attribute")
- @XmlJavaTypeAdapter(UserAttributeAdapter.class)
- public Map<String, UserAttributeMetaData> getUserAttributes()
- {
- return userAttributes;
- }
-
- public void setUserAttributes(Map<String, UserAttributeMetaData>
userAttributes)
- {
- this.userAttributes = userAttributes;
- }
-
- public void addUserAttribute(UserAttributeMetaData userAttribute)
- {
- if( this.userAttributes == null )
- {
- this.userAttributes = new HashMap<String, UserAttributeMetaData>();
- }
- this.userAttributes.put(userAttribute.getName(), userAttribute);
- }
-
- @XmlElement(name = "custom-portlet-mode")
- @XmlJavaTypeAdapter(CustomPortletModeAdapter.class)
- public Map<String, CustomPortletModeMetaData> getCustomPortletModes()
- {
- return customPortletModes;
- }
-
- public void setCustomPortletModes(Map<String, CustomPortletModeMetaData>
customPortletMode)
- {
- this.customPortletModes = customPortletMode;
- }
-
- public void addCustomPortletMode(CustomPortletModeMetaData portletMode)
- {
- if ( this.customPortletModes == null)
- {
- this.customPortletModes = new HashMap<String,
CustomPortletModeMetaData>();
- }
- this.customPortletModes.put(portletMode.getPortletMode(), portletMode);
- }
-
- @XmlElement(name = "custom-window-state")
- @XmlJavaTypeAdapter(CustomWindowStateAdapter.class)
- public Map<String, CustomWindowStateMetaData> getCustomWindowStates()
- {
- return customWindowStates;
- }
-
- public void setCustomWindowStates(Map<String, CustomWindowStateMetaData>
customWindowState)
- {
- this.customWindowStates = customWindowState;
- }
-
- public void addCustomWindowState(CustomWindowStateMetaData windowState)
- {
- if( this.customWindowStates == null )
- {
- this.customWindowStates = new HashMap<String,
CustomWindowStateMetaData>();
- }
- this.customWindowStates.put(windowState.getWindowState(), windowState);
- }
-
- @XmlElement(name = "security-constraint")
- public List<SecurityConstraintMetaData> getSecurityConstraints()
- {
- return securityConstraints;
- }
-
- public void setSecurityConstraints(List<SecurityConstraintMetaData>
securityConstraints)
- {
- this.securityConstraints = securityConstraints;
- }
-
- public void addSecurityConstraint(SecurityConstraintMetaData securityConstraint)
- {
- if(this.securityConstraints == null)
- {
- this.securityConstraints = new ArrayList<SecurityConstraintMetaData>();
- }
- this.securityConstraints.add(securityConstraint);
- }
-
@XmlElement(name = "resource-bundle", namespace =
PortletMetaDataConstants.PORTLET_JSR_286_NS)
public String getResourceBundle()
{
Deleted:
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaData.java
===================================================================
---
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaData.java 2008-01-07
19:56:29 UTC (rev 9448)
+++
modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/test/metadata/impl/PortletApplicationMetaData.java 2008-01-08
00:27:36 UTC (rev 9449)
@@ -1,104 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.portlet.test.metadata.impl;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.portal.portlet.test.metadata.impl.common.ContainerRuntimeMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMappingMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.filter.FilterMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.portlet.PortletMetaData;
-import org.jboss.portal.portlet.test.metadata.impl.security.SecurityConstraintMetaData;
-
-/**
- * @author <a href="mailto:emuckenh@redhat.com">Emanuel
Muckenhuber</a>
- * @version $Revision$
- */
-public interface PortletApplicationMetaData
-{
- public String getId();
-
- public void setId(String id);
-
- public String getVersion();
-
- public void setVersion(String version);
-
-
- // portlet
- public Collection<PortletMetaData> getPortletCollection();
-
- public PortletMetaData getPortlet(String portletName);
-
- public void addPortlet(PortletMetaData portlet);
-
-
- // user-attribute
- public Map<String, UserAttributeMetaData> getUserAttributes();
-
- public void addUserAttribute(UserAttributeMetaData userAttribute);
-
-
- // custom-portlet-mode
- public Map<String, CustomPortletModeMetaData> getCustomPortletModes();
-
- public void addCustomPortletMode(CustomPortletModeMetaData portletMode);
-
-
- // custom-window-state
- public Map<String, CustomWindowStateMetaData> getCustomWindowStates();
-
- public void addCustomWindowState(CustomWindowStateMetaData windowState);
-
-
- // security-constraint
- public List<SecurityConstraintMetaData> getSecurityConstraints();
-
- public void addSecurityConstraint(SecurityConstraintMetaData securityConstraint);
-
-
- public String getResourceBundle();
-
- public URI getDefaultNamespace();
-
- public Collection<FilterMetaData> getFilterCollection();
-
- public FilterMetaData getFilter(String filterName);
-
- public Map<String, FilterMappingMetaData> getFilterMapping();
-
- public List<EventDefinitionMetaData> getEvents();
-
- public List<PublicRenderParameterMetaData> getPublicRenderParameters();
-
- public Set<String> getContainerRuntimeOptionSet();
-
- public ContainerRuntimeMetaData getContainerRuntimeOption(String option);
-
- public List<ListenerMetaData> getListeners();
-}