[portal-commits] JBoss Portal SVN: r13015 - in modules/portlet/branches/JBP_PORTLET_AS5_Deployer: build and 12 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Mar 10 18:42:36 EDT 2009
Author: mwringe
Date: 2009-03-10 18:42:35 -0400 (Tue, 10 Mar 2009)
New Revision: 13015
Added:
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LifeCyclePhaseAdapter.java
Removed:
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomPortletModeMetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomWindowStateMetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ListenerMetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication20MetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletMetaDataConstants.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PublicRenderParameterMetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/UserAttributeMetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ValidationErrorHandler.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/common/
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/event/
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/portlet/
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/
Modified:
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/.classpath
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/build/pom.xml
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/pom.xml
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployer.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployment.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/LocalizedStringBuilder.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication10MetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication20MetaData.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/AbstractMetaDataTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomPortletModeTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomWindowStateTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/EventTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/GeneralMetaDataTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/PortletTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/RenderParameterTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/UserAttributeTestEverythingTestCase.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/pom.xml
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/pom.xml
modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/src/test/build.xml
Log:
Update to use the metadata module instead of internal metadata classes.
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/.classpath
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/.classpath 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/.classpath 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="portlet/src/main/java"/>
+ <classpathentry kind="src" path="mc/src/test/java"/>
<classpathentry kind="src" path="bridge/src/main/java"/>
<classpathentry kind="src" path="controller/src/main/java"/>
<classpathentry kind="src" path="federation/src/main/java"/>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/build/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/build/pom.xml 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/build/pom.xml 2009-03-10 22:42:35 UTC (rev 13015)
@@ -34,6 +34,7 @@
<version.jbossxb>2.0.0.GA</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
<version.jboss.portal.common>1.2.3</version.jboss.portal.common>
+ <version.jboss.portal.metadata>trunk-SNAPSHOT</version.jboss.portal.metadata>
<version.jboss.portal.web>1.2.3</version.jboss.portal.web>
<version.jboss.unit>1.2.2</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
@@ -205,8 +206,12 @@
<artifactId>common-mc</artifactId>
<version>${version.jboss.portal.common}</version>
</dependency>
-
<dependency>
+ <groupId>org.jboss.portal.metadata</groupId>
+ <artifactId>metadata-metadata</artifactId>
+ <version>${version.jboss.portal.metadata}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.portal.web</groupId>
<artifactId>web-web</artifactId>
<version>${version.jboss.portal.web}</version>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/pom.xml 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/pom.xml 2009-03-10 22:42:35 UTC (rev 13015)
@@ -18,6 +18,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.portal.metadata</groupId>
+ <artifactId>metadata-metadata</artifactId>
+ <version>${version.jboss.portal.metadata}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
</dependency>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployer.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployer.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployer.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -35,9 +35,9 @@
import org.jboss.portal.portlet.container.managed.LifeCycleStatus;
import org.jboss.portal.portlet.container.ContainerPortletInvoker;
import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_168_NS;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_286_NS;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_168_NS;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_286_NS;
import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle;
import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle;
import org.jboss.portal.portlet.mc.metadata.factory.PortletApplicationModelFactory;
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployment.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployment.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/PortletApplicationDeployment.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -31,7 +31,7 @@
import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
import org.jboss.portal.portlet.impl.jsr168.PortletFilterImpl;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
import org.jboss.portal.portlet.impl.container.PortletApplicationLifeCycle;
import org.jboss.portal.portlet.impl.container.PortletFilterLifeCycle;
import org.jboss.portal.portlet.impl.container.PortletContainerLifeCycle;
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/LocalizedStringBuilder.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/LocalizedStringBuilder.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/LocalizedStringBuilder.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -26,7 +26,7 @@
import org.apache.log4j.Logger;
import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
-import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData;
+import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -57,11 +57,11 @@
container.addLocalizedDescription(description);
}
- public LocalizedString getLocalizedString(Object key)
+ public List<LocalizedDescriptionMetaData> getLocalizedDescriptionMetaData(Object key)
{
try
{
- return this.map.get(key) != null ? this.map.get(key).getLocalizedString() : null;
+ return this.map.get(key) != null ? this.map.get(key).getList() : null;
}
catch (Exception e)
{
@@ -80,10 +80,9 @@
this.list.add(description);
}
- public LocalizedString getLocalizedString() throws Exception
+ public List<LocalizedDescriptionMetaData> getList()
{
- LocalizedStringAdapter adapter = new LocalizedStringAdapter();
- return adapter.unmarshal(list);
+ return list;
}
}
}
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -29,36 +29,36 @@
import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.portlet.LifeCyclePhase;
import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
-import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.ListenerMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.DEFAULT_LOCALE;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.PORTLET_JSR_286_NS;
-import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletCacheScopeEnum;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportedLocaleMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.PortletCollectionMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.UserDataConstraintMetaData;
+import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData;
+import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData;
+import org.jboss.portal.metadata.portlet.ListenerMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.DEFAULT_LOCALE;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.PORTLET_JSR_286_NS;
+import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
+import org.jboss.portal.metadata.portlet.UserAttributeMetaData;
+import org.jboss.portal.metadata.portlet.common.ContainerRuntimeMetaData;
+import org.jboss.portal.metadata.portlet.common.DescribableMetaData;
+import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
+import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData;
+import org.jboss.portal.metadata.portlet.filter.FilterMappingMetaData;
+import org.jboss.portal.metadata.portlet.filter.FilterMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletCacheScopeEnum;
+import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData;
+import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData;
+import org.jboss.portal.metadata.portlet.security.PortletCollectionMetaData;
+import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData;
+import org.jboss.portal.metadata.portlet.security.UserDataConstraintMetaData;
import org.jboss.portal.portlet.mc.metadata.impl.AnnotationPortletApplication10MetaData;
import org.jboss.portal.portlet.mc.metadata.impl.AnnotationPortletApplication20MetaData;
import org.jboss.xb.binding.GenericObjectModelFactory;
@@ -67,6 +67,10 @@
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
@@ -304,7 +308,7 @@
if (child instanceof DescribableMetaData)
{
DescribableMetaData md = (DescribableMetaData)child;
- LocalizedString d = this.descriptions.getLocalizedString(md);
+ List<LocalizedDescriptionMetaData> d = this.descriptions.getLocalizedDescriptionMetaData(md);
md.setDescription(d);
}
@@ -316,7 +320,7 @@
if (child instanceof PortletMetaData)
{
PortletMetaData portlet = (PortletMetaData)child;
- portlet.setDisplayName(this.displayNames.getLocalizedString(portlet));
+ portlet.setDisplayName(this.displayNames.getLocalizedDescriptionMetaData(portlet));
md.addPortlet(portlet);
}
// add custom-portlet-mode
@@ -339,7 +343,7 @@
{
SecurityConstraintMetaData security = (SecurityConstraintMetaData)child;
// display-name
- security.setDisplayName(this.displayNames.getLocalizedString(security));
+ security.setDisplayName(this.displayNames.getLocalizedDescriptionMetaData(security));
md.addSecurityConstraint(security);
}
}
@@ -362,7 +366,7 @@
else if (child instanceof FilterMetaData)
{
FilterMetaData filter = (FilterMetaData)child;
- filter.setDisplayName(this.displayNames.getLocalizedString(filter));
+ filter.setDisplayName(this.displayNames.getLocalizedDescriptionMetaData(filter));
md.addFilter(filter);
}
// add filter-mapping
@@ -379,7 +383,7 @@
else if (child instanceof ListenerMetaData)
{
ListenerMetaData listener = (ListenerMetaData)child;
- listener.setDisplayName(this.displayNames.getLocalizedString(listener));
+ listener.setDisplayName(this.displayNames.getLocalizedDescriptionMetaData(listener));
md.addListener(listener);
}
}
@@ -586,7 +590,7 @@
PortletModeMetaData md = (PortletModeMetaData)object;
if ("portlet-mode".equals(localName))
{
- md.setPortletMode(Mode.create(value));
+ md.setPortletMode(value);
}
}
@@ -596,7 +600,7 @@
WindowStateMetaData md = (WindowStateMetaData)object;
if ("window-state".equals(localName))
{
- md.setWindowState(WindowState.create(value));
+ md.setWindowState(value);
}
}
@@ -724,7 +728,7 @@
UserDataConstraintMetaData md = (UserDataConstraintMetaData)object;
if ("transport-guarantee".equals(localName))
{
- md.setTransportQuarantee(TransportGuarantee.valueOf(value));
+ md.setTransportQuarantee(value);
}
}
@@ -756,7 +760,7 @@
String lifeCycle = value.substring(0, end > 0 ? end : 0);
try
{
- md.addLifecycle(LifeCyclePhase.valueOf(lifeCycle));
+ md.addLifecycle(lifeCycle);
}
catch (IllegalArgumentException e)
{
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication10MetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication10MetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication10MetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -23,8 +23,8 @@
package org.jboss.portal.portlet.mc.metadata.impl;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
import javax.xml.bind.annotation.XmlNs;
@@ -44,4 +44,4 @@
elementFormDefault = XmlNsForm.QUALIFIED)
public class AnnotationPortletApplication10MetaData extends PortletApplication10MetaData
{
-}
\ No newline at end of file
+}
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication20MetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication20MetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/impl/AnnotationPortletApplication20MetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -23,8 +23,8 @@
package org.jboss.portal.portlet.mc.metadata.impl;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PortletMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
import javax.xml.bind.annotation.XmlNs;
@@ -45,4 +45,4 @@
elementFormDefault = XmlNsForm.QUALIFIED)
public class AnnotationPortletApplication20MetaData extends PortletApplication20MetaData
{
-}
\ No newline at end of file
+}
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/AbstractMetaDataTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/AbstractMetaDataTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/AbstractMetaDataTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -30,10 +30,10 @@
import org.jboss.portal.portlet.mc.metadata.impl.AnnotationPortletApplication10MetaData;
import org.jboss.portal.portlet.mc.metadata.impl.AnnotationPortletApplication20MetaData;
import org.jboss.portal.portlet.mc.metadata.impl.ValueTrimmingFilter;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.*;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.*;
import org.jboss.unit.api.pojo.annotations.Parameter;
import org.jboss.xb.binding.JBossXBException;
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomPortletModeTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomPortletModeTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomPortletModeTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -24,9 +24,11 @@
import java.util.Locale;
-import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -56,9 +58,12 @@
assertNotNull(cmd1);
assertEquals("mode1", cmd1.getId());
assertEquals("Custom", cmd1.getPortletMode());
- assertEquals("portletMode1", cmd1.getDescription().getDefaultString());
- assertEquals("eigener portlet modus", cmd1.getDescription().getString(new Locale("de"), false));
+ LocalizedString localizedString = LocalizedStringAdapter.getLocalizedString(cmd1.getDescription());
+
+ assertEquals("portletMode1", localizedString.getDefaultString());
+ assertEquals("eigener portlet modus", localizedString.getString(new Locale("de"), false));
+
assertNotNull(md.getCustomPortletModes().get("Custom2"));
}
catch (Exception e)
@@ -84,7 +89,10 @@
CustomPortletModeMetaData cmd1 = md.getCustomPortletModes().get("Custom");
assertNotNull(cmd1);
assertEquals("Custom", cmd1.getPortletMode());
- assertEquals("portletMode1", cmd1.getDescription().getDefaultString());
+
+ LocalizedString localizedString = LocalizedStringAdapter.getLocalizedString(cmd1.getDescription());
+
+ assertEquals("portletMode1", localizedString.getDefaultString());
assertEquals(true, cmd1.isPortalManaged());
assertEquals("cmode1", cmd1.getId());
@@ -99,10 +107,13 @@
// default value
assertEquals(true, cmd3.isPortalManaged());
- assertEquals("eigener portlet modus", cmd1.getDescription().getString(new Locale("de"), false));
- assertEquals("Portlet Mode Three", cmd3.getDescription().getDefaultString());
+ LocalizedString localizedString3 = LocalizedStringAdapter.getLocalizedString(cmd3.getDescription());
+
+ assertEquals("eigener portlet modus", localizedString.getString(new Locale("de"), false));
+ assertEquals("Portlet Mode Three", localizedString3.getDefaultString());
+
}
catch (Exception e)
{
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomWindowStateTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomWindowStateTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/CustomWindowStateTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -24,9 +24,11 @@
import java.util.Locale;
-import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -51,9 +53,13 @@
assertEquals("1.0", md.getVersion());
CustomWindowStateMetaData cws1 = md.getCustomWindowStates().get("windowState1");
- assertEquals("WindowState", cws1.getDescription().getDefaultString());
+
+ LocalizedString cws1Description = LocalizedStringAdapter.getLocalizedString(cws1.getDescription());
+
+ assertEquals("WindowState", cws1Description.getDefaultString());
assertEquals("windowState1", cws1.getWindowState());
- assertEquals("Offenes Fenster", cws1.getDescription().getString(new Locale("de"), false));
+
+ assertEquals("Offenes Fenster", cws1Description.getString(new Locale("de"), false));
assertEquals("foo", cws1.getId());
CustomWindowStateMetaData cws2 = md.getCustomWindowStates().get("windowState2");
assertNotNull(cws2);
@@ -82,9 +88,12 @@
assertEquals("2.0", md.getVersion());
CustomWindowStateMetaData cws1 = md.getCustomWindowStates().get("windowState1");
- assertEquals("WindowState", cws1.getDescription().getDefaultString());
+
+ LocalizedString cws1Description = LocalizedStringAdapter.getLocalizedString(cws1.getDescription());
+
+ assertEquals("WindowState", cws1Description.getDefaultString());
assertEquals("windowState1", cws1.getWindowState());
- assertEquals("Offenes Fenster", cws1.getDescription().getString(new Locale("de"), false));
+ assertEquals("Offenes Fenster", cws1Description.getString(new Locale("de"), false));
assertEquals("foo", cws1.getId());
CustomWindowStateMetaData cws2 = md.getCustomWindowStates().get("windowState2");
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/EventTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/EventTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/EventTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -26,11 +26,13 @@
import javax.xml.namespace.QName;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -79,10 +81,13 @@
assertEquals("portletEvent", qname.getLocalPart());
assertEquals("x", qname.getPrefix());
assertEquals("org.jboss.portal.event.invoke.refill.beer", emd.getValueType());
- assertEquals("descriptionDefaultLanguage", emd.getDescription().getDefaultString());
- assertEquals("descriptionDefaultLanguage", emd.getDescription().getString(new Locale("en"), false));
- assertEquals("Beschreibung in Deutsch", emd.getDescription().getString(new Locale("de"), false));
+ LocalizedString emdDescription = LocalizedStringAdapter.getLocalizedString(emd.getDescription());
+
+ assertEquals("descriptionDefaultLanguage", emdDescription.getDefaultString());
+ assertEquals("descriptionDefaultLanguage", emdDescription.getString(new Locale("en"), false));
+ assertEquals("Beschreibung in Deutsch", emdDescription.getString(new Locale("de"), false));
+
EventDefinitionMetaData emd2 = md.getEvents().get(1);
assertNull(emd2.getQname());
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -25,9 +25,13 @@
import java.util.Locale;
import org.jboss.portal.portlet.LifeCyclePhase;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
+import org.jboss.portal.portlet.container.managed.LifeCycleStatus;
+import org.jboss.portal.portlet.impl.container.LifeCycle;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
+import org.jboss.portal.metadata.portlet.filter.FilterMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -69,15 +73,19 @@
assertNotNull(filter);
assertEquals("org.jboss.portal.meta.NoExistingClass", filter.getFilterClass());
assertEquals("testFilter", filter.getFilterName());
- assertEquals(LifeCyclePhase.ACTION, filter.getLifecycle().get(0));
- assertEquals(LifeCyclePhase.RENDER, filter.getLifecycle().get(1));
+ assertEquals(LifeCyclePhase.ACTION, LifeCyclePhase.valueOf(filter.getLifecycle().get(0)));
+ assertEquals(LifeCyclePhase.RENDER, LifeCyclePhase.valueOf(filter.getLifecycle().get(1)));
- assertEquals("test", filter.getDescription().getDefaultString());
- assertEquals("bla", filter.getDescription().getString(new Locale("de"), false));
+ LocalizedString filterDescription = LocalizedStringAdapter.getLocalizedString(filter.getDescription());
- assertEquals("foo", filter.getDisplayName().getString(new Locale("fr"), false));
- assertEquals("foobar", filter.getDisplayName().getDefaultString());
+ assertEquals("test", filterDescription.getDefaultString());
+ assertEquals("bla", filterDescription.getString(new Locale("de"), false));
+
+ LocalizedString filterDisplayName = LocalizedStringAdapter.getLocalizedString(filter.getDisplayName());
+ assertEquals("foo", filterDisplayName.getString(new Locale("fr"), false));
+ assertEquals("foobar", filterDisplayName.getDefaultString());
+
InitParamMetaData ip = filter.getInitParams().get(0);
assertEquals("eins", ip.getId());
assertEquals("foo", ip.getName());
@@ -92,7 +100,7 @@
//
FilterMetaData filter2 = md.getFilter("testFilterZwei");
assertEquals("testFilterZwei", filter2.getFilterName());
- assertEquals(LifeCyclePhase.ACTION, filter2.getLifecycle().get(0));
+ assertEquals(LifeCyclePhase.ACTION, LifeCyclePhase.valueOf(filter2.getLifecycle().get(0)));
// Filter mapping
assertEquals("Portlet1", md.getFilterMapping().get(0).getPortletNames().get(0));
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/GeneralMetaDataTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/GeneralMetaDataTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/GeneralMetaDataTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -25,10 +25,12 @@
import java.net.URI;
import java.util.Locale;
-import org.jboss.portal.portlet.impl.metadata.ListenerMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.ListenerMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -88,7 +90,9 @@
PublicRenderParameterMetaData prp1 = md.getPublicRenderParameters().get(0);
- assertEquals("Public render parameter one", prp1.getDescription().getDefaultString());
+ LocalizedString prp1Description = LocalizedStringAdapter.getLocalizedString(prp1.getDescription());
+
+ assertEquals("Public render parameter one", prp1Description.getDefaultString());
assertEquals("param1", prp1.getId());
assertEquals("param1", prp1.getName());
assertEquals("Parameter1", prp1.getAlias().get(0).getLocalPart());
@@ -99,10 +103,13 @@
assertEquals("foobar2", md.getContainerRuntimeOption("foo").getValues().get(1));
ListenerMetaData listener1 = md.getListeners().get(0);
+ LocalizedString listener1DisplayName = LocalizedStringAdapter.getLocalizedString(listener1.getDisplayName());
+ LocalizedString listener1Description = LocalizedStringAdapter.getLocalizedString(listener1.getDescription());
+
assertNotNull(listener1);
assertEquals("org.jboss.portal.portlet.test.listener.MyListener", listener1.getListenerClass());
- assertEquals("Mein Zuh\u00f6rer Eins", listener1.getDisplayName().getString(new Locale("de"), false));
- assertEquals("Beschreibung", listener1.getDescription().getString(new Locale("de"), false));
+ assertEquals("Mein Zuh\u00f6rer Eins", listener1DisplayName.getString(new Locale("de"), false));
+ assertEquals("Beschreibung", listener1Description.getString(new Locale("de"), false));
assertNotNull(md.getListeners().get(1));
}
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/PortletTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/PortletTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/PortletTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -25,19 +25,23 @@
import java.util.List;
import java.util.Locale;
+import javax.portlet.PortletMode;
+
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants;
-import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletCacheScopeEnum;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportedLocaleMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PortletMetaDataConstants;
+import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletCacheScopeEnum;
+import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -65,29 +69,36 @@
Locale default_locale = new Locale(PortletMetaDataConstants.DEFAULT_LOCALE);
PortletMetaData p1 = md.getPortlet("Portlet1");
+ LocalizedString p1Description = LocalizedStringAdapter.getLocalizedString(p1.getDescription());
+ LocalizedString p1DisplayName = LocalizedStringAdapter.getLocalizedString(p1.getDisplayName());
+
assertNotNull(p1);
assertEquals(md, p1.getPortletApplication());
assertEquals("fragmichnicht", p1.getId());
assertEquals("Portlet1", p1.getPortletName());
- assertEquals(default_locale, p1.getDescription().getDefaultLocale());
- assertEquals("default", p1.getDescription().getDefaultString());
- assertEquals("defaut", p1.getDescription().getString(fr, false));
- assertEquals(default_locale, p1.getDisplayName().getDefaultLocale());
- assertEquals("display", p1.getDisplayName().getDefaultString());
- assertEquals("affichage", p1.getDisplayName().getString(fr, false));
+ assertEquals(default_locale, p1Description.getDefaultLocale());
+ assertEquals("default", p1Description.getDefaultString());
+ assertEquals("defaut", p1Description.getString(fr, false));
+ assertEquals(default_locale, p1DisplayName.getDefaultLocale());
+ assertEquals("display", p1DisplayName.getDefaultString());
+ assertEquals("affichage", p1DisplayName.getString(fr, false));
assertEquals("org.jboss.portal.test.portlet.TestPortlet", p1.getPortletClass());
InitParamMetaData ip1 = p1.getInitParams().get(0);
- assertEquals(default_locale, ip1.getDescription().getDefaultLocale());
- assertEquals("first parameter", ip1.getDescription().getDefaultString());
- assertEquals("premier parametre", ip1.getDescription().getString(fr, false));
+ LocalizedString ip1Description = LocalizedStringAdapter.getLocalizedString(ip1.getDescription());
+
+ assertEquals(default_locale, ip1Description.getDefaultLocale());
+ assertEquals("first parameter", ip1Description.getDefaultString());
+ assertEquals("premier parametre", ip1Description.getString(fr, false));
assertEquals("one", ip1.getName());
assertEquals("1", ip1.getValue());
InitParamMetaData ip2 = p1.getInitParams().get(1);
+ LocalizedString ip2Description = LocalizedStringAdapter.getLocalizedString(ip2.getDescription());
+
assertNotNull(ip2);
- assertEquals("second parameter", ip2.getDescription().getDefaultString());
- assertEquals("deuxieme parametre", ip2.getDescription().getString(fr, false));
+ assertEquals("second parameter", ip2Description.getDefaultString());
+ assertEquals("deuxieme parametre", ip2Description.getString(fr, false));
assertEquals("two", ip2.getName());
assertEquals("2", ip2.getValue());
@@ -96,14 +107,14 @@
SupportsMetaData smd1 = p1.getSupports().get(0);
assertEquals("text/html", smd1.getMimeType());
- assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode());
- assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd1.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("EDIT"), Mode.create(smd1.getPortletModes().get(1).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd1.getPortletModes().get(2).getPortletMode()));
SupportsMetaData smd2 = p1.getSupports().get(1);
assertEquals("text/wml", smd2.getMimeType());
- assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd2.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd2.getPortletModes().get(1).getPortletMode()));
assertEquals("MyResourceBundle", p1.getResourceBundle());
@@ -133,15 +144,17 @@
assertEquals("3", ppmd.getPortletPreferences().get("all").getValue().get(2));
SecurityRoleRefMetaData srrmd1 = p1.getSecurityRoleRef().get(0);
+ LocalizedString srrmd1Description = LocalizedStringAdapter.getLocalizedString(srrmd1.getDescription());
assertNotNull(srrmd1);
- assertEquals("role with no link", srrmd1.getDescription().getDefaultString());
- assertEquals("role sans link", srrmd1.getDescription().getString(fr, false));
+ assertEquals("role with no link", srrmd1Description.getDefaultString());
+ assertEquals("role sans link", srrmd1Description.getString(fr, false));
assertEquals("ROLE_NAME_WITHOUT_LINK", srrmd1.getRoleName());
SecurityRoleRefMetaData srrmd2 = p1.getSecurityRoleRef().get(1);
+ LocalizedString srrmd2Description = LocalizedStringAdapter.getLocalizedString(srrmd2.getDescription());
assertNotNull(srrmd2);
- assertEquals("role with link", srrmd2.getDescription().getDefaultString());
- assertEquals("role avec link", srrmd2.getDescription().getString(fr, false));
+ assertEquals("role with link", srrmd2Description.getDefaultString());
+ assertEquals("role avec link", srrmd2Description.getString(fr, false));
assertEquals("ROLE_NAME_WITH_LINK", srrmd2.getRoleName());
assertEquals("ROLE_LINK", srrmd2.getRoleLink());
@@ -233,28 +246,32 @@
Locale default_locale = new Locale(PortletMetaDataConstants.DEFAULT_LOCALE);
PortletMetaData p1 = md.getPortlet("Portlet1");
+ LocalizedString p1Description = LocalizedStringAdapter.getLocalizedString(p1.getDescription());
+ LocalizedString p1DisplayName = LocalizedStringAdapter.getLocalizedString(p1.getDisplayName());
assertNotNull(p1);
assertEquals("fragmichnicht2", p1.getId());
assertEquals("Portlet1", p1.getPortletName());
- assertEquals(default_locale, p1.getDescription().getDefaultLocale());
- assertEquals("default", p1.getDescription().getDefaultString());
- assertEquals("defaut", p1.getDescription().getString(fr, false));
- assertEquals(default_locale, p1.getDisplayName().getDefaultLocale());
- assertEquals("display", p1.getDisplayName().getDefaultString());
- assertEquals("affichage", p1.getDisplayName().getString(fr, false));
+ assertEquals(default_locale, p1Description.getDefaultLocale());
+ assertEquals("default", p1Description.getDefaultString());
+ assertEquals("defaut", p1Description.getString(fr, false));
+ assertEquals(default_locale, p1DisplayName.getDefaultLocale());
+ assertEquals("display", p1DisplayName.getDefaultString());
+ assertEquals("affichage", p1DisplayName.getString(fr, false));
assertEquals("org.jboss.portal.test.portlet.TestPortlet", p1.getPortletClass());
InitParamMetaData ip1 = p1.getInitParams().get(0);
- assertEquals(default_locale, ip1.getDescription().getDefaultLocale());
- assertEquals("first parameter", ip1.getDescription().getDefaultString());
- assertEquals("premier parametre", ip1.getDescription().getString(fr, false));
+ LocalizedString ip1Description = LocalizedStringAdapter.getLocalizedString(ip1.getDescription());
+ assertEquals(default_locale, ip1Description.getDefaultLocale());
+ assertEquals("first parameter", ip1Description.getDefaultString());
+ assertEquals("premier parametre", ip1Description.getString(fr, false));
assertEquals("one", ip1.getName());
assertEquals("1", ip1.getValue());
InitParamMetaData ip2 = p1.getInitParams().get(1);
+ LocalizedString ip2Description = LocalizedStringAdapter.getLocalizedString(ip2.getDescription());
assertNotNull(ip2);
- assertEquals("second parameter", ip2.getDescription().getDefaultString());
- assertEquals("deuxieme parametre", ip2.getDescription().getString(fr, false));
+ assertEquals("second parameter", ip2Description.getDefaultString());
+ assertEquals("deuxieme parametre", ip2Description.getString(fr, false));
assertEquals("two", ip2.getName());
assertEquals("2", ip2.getValue());
@@ -266,14 +283,14 @@
SupportsMetaData smd1 = p1.getSupports().get(0);
assertEquals("text/html", smd1.getMimeType());
- assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode());
- assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd1.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("EDIT"), Mode.create(smd1.getPortletModes().get(1).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd1.getPortletModes().get(2).getPortletMode()));
SupportsMetaData smd2 = p1.getSupports().get(1);
assertEquals("text/wml", smd2.getMimeType());
- assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd2.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd2.getPortletModes().get(1).getPortletMode()));
List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale();
assertEquals(3, localeList.size());
@@ -302,15 +319,17 @@
assertEquals("3", ppmd.getPortletPreferences().get("all").getValue().get(2));
SecurityRoleRefMetaData srrmd1 = p1.getSecurityRoleRef().get(0);
+ LocalizedString srrmd1Description = LocalizedStringAdapter.getLocalizedString(srrmd1.getDescription());
assertNotNull(srrmd1);
- assertEquals("role with no link", srrmd1.getDescription().getDefaultString());
- assertEquals("role sans link", srrmd1.getDescription().getString(fr, false));
+ assertEquals("role with no link", srrmd1Description.getDefaultString());
+ assertEquals("role sans link", srrmd1Description.getString(fr, false));
assertEquals("ROLE_NAME_WITHOUT_LINK", srrmd1.getRoleName());
SecurityRoleRefMetaData srrmd2 = p1.getSecurityRoleRef().get(1);
+ LocalizedString srrmd2Description = LocalizedStringAdapter.getLocalizedString(srrmd2.getDescription());
assertNotNull(srrmd2);
- assertEquals("role with link", srrmd2.getDescription().getDefaultString());
- assertEquals("role avec link", srrmd2.getDescription().getString(fr, false));
+ assertEquals("role with link", srrmd2Description.getDefaultString());
+ assertEquals("role avec link", srrmd2Description.getString(fr, false));
assertEquals("ROLE_NAME_WITH_LINK", srrmd2.getRoleName());
assertEquals("ROLE_LINK", srrmd2.getRoleLink());
@@ -393,28 +412,32 @@
Locale default_locale = new Locale(PortletMetaDataConstants.DEFAULT_LOCALE);
PortletMetaData p1 = md.getPortlet("Portlet1");
+ LocalizedString p1Description = LocalizedStringAdapter.getLocalizedString(p1.getDescription());
+ LocalizedString p1DisplayName = LocalizedStringAdapter.getLocalizedString(p1.getDisplayName());
assertNotNull(p1);
assertEquals("fragmichnicht2", p1.getId());
assertEquals("Portlet1", p1.getPortletName());
- assertEquals(default_locale, p1.getDescription().getDefaultLocale());
- assertEquals("default", p1.getDescription().getDefaultString());
- assertEquals("defaut", p1.getDescription().getString(fr, false));
- assertEquals(default_locale, p1.getDisplayName().getDefaultLocale());
- assertEquals("display", p1.getDisplayName().getDefaultString());
- assertEquals("affichage", p1.getDisplayName().getString(fr, false));
+ assertEquals(default_locale, p1Description.getDefaultLocale());
+ assertEquals("default", p1Description.getDefaultString());
+ assertEquals("defaut", p1Description.getString(fr, false));
+ assertEquals(default_locale, p1DisplayName.getDefaultLocale());
+ assertEquals("display", p1DisplayName.getDefaultString());
+ assertEquals("affichage", p1DisplayName.getString(fr, false));
assertEquals("org.jboss.portal.test.portlet.TestPortlet", p1.getPortletClass());
InitParamMetaData ip1 = p1.getInitParams().get(0);
- assertEquals(default_locale, ip1.getDescription().getDefaultLocale());
- assertEquals("first parameter", ip1.getDescription().getDefaultString());
- assertEquals("premier parametre", ip1.getDescription().getString(fr, false));
+ LocalizedString ip1Description = LocalizedStringAdapter.getLocalizedString(ip1.getDescription());
+ assertEquals(default_locale, ip1Description.getDefaultLocale());
+ assertEquals("first parameter", ip1Description.getDefaultString());
+ assertEquals("premier parametre", ip1Description.getString(fr, false));
assertEquals("one", ip1.getName());
assertEquals("1", ip1.getValue());
InitParamMetaData ip2 = p1.getInitParams().get(1);
+ LocalizedString ip2Description = LocalizedStringAdapter.getLocalizedString(ip2.getDescription());
assertNotNull(ip2);
- assertEquals("second parameter", ip2.getDescription().getDefaultString());
- assertEquals("deuxieme parametre", ip2.getDescription().getString(fr, false));
+ assertEquals("second parameter", ip2Description.getDefaultString());
+ assertEquals("deuxieme parametre", ip2Description.getString(fr, false));
assertEquals("two", ip2.getName());
assertEquals("2", ip2.getValue());
@@ -423,21 +446,21 @@
SupportsMetaData smd1 = p1.getSupports().get(0);
assertEquals("text/html", smd1.getMimeType());
- assertEquals(Mode.create("VIEW"), smd1.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("EDIT"), smd1.getPortletModes().get(1).getPortletMode());
- assertEquals(Mode.create("HELP"), smd1.getPortletModes().get(2).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd1.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("EDIT"), Mode.create(smd1.getPortletModes().get(1).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd1.getPortletModes().get(2).getPortletMode()));
// window state jsr 286
- assertEquals(WindowState.create("MAXIMIZED"), smd1.getWindowStates().get(0).getWindowState());
- assertEquals(WindowState.create("NORMAL"), smd1.getWindowStates().get(1).getWindowState());
+ assertEquals(WindowState.create("MAXIMIZED"), WindowState.create(smd1.getWindowStates().get(0).getWindowState()));
+ assertEquals(WindowState.create("NORMAL"), WindowState.create(smd1.getWindowStates().get(1).getWindowState()));
SupportsMetaData smd2 = p1.getSupports().get(1);
assertEquals("foo", smd2.getId());
assertEquals("text/wml", smd2.getMimeType());
- assertEquals(Mode.create("VIEW"), smd2.getPortletModes().get(0).getPortletMode());
- assertEquals(Mode.create("HELP"), smd2.getPortletModes().get(1).getPortletMode());
+ assertEquals(Mode.create("VIEW"), Mode.create(smd2.getPortletModes().get(0).getPortletMode()));
+ assertEquals(Mode.create("HELP"), Mode.create(smd2.getPortletModes().get(1).getPortletMode()));
// window state jsr 286
- assertEquals(WindowState.create("NORMAL"), smd2.getWindowStates().get(0).getWindowState());
- assertEquals(WindowState.create("CUSTOM"), smd2.getWindowStates().get(1).getWindowState());
+ assertEquals(WindowState.create("NORMAL"), WindowState.create(smd2.getWindowStates().get(0).getWindowState()));
+ assertEquals(WindowState.create("CUSTOM"), WindowState.create(smd2.getWindowStates().get(1).getWindowState()));
List<SupportedLocaleMetaData> localeList = p1.getSupportedLocale();
assertEquals(3, localeList.size());
@@ -466,15 +489,17 @@
assertEquals("3", ppmd.getPortletPreferences().get("all").getValue().get(2));
SecurityRoleRefMetaData srrmd1 = p1.getSecurityRoleRef().get(0);
+ LocalizedString srrmd1Description = LocalizedStringAdapter.getLocalizedString(srrmd1.getDescription());
assertNotNull(srrmd1);
- assertEquals("role with no link", srrmd1.getDescription().getDefaultString());
- assertEquals("role sans link", srrmd1.getDescription().getString(fr, false));
+ assertEquals("role with no link", srrmd1Description.getDefaultString());
+ assertEquals("role sans link", srrmd1Description.getString(fr, false));
assertEquals("ROLE_NAME_WITHOUT_LINK", srrmd1.getRoleName());
SecurityRoleRefMetaData srrmd2 = p1.getSecurityRoleRef().get(1);
+ LocalizedString srrmd2Description = LocalizedStringAdapter.getLocalizedString(srrmd2.getDescription());
assertNotNull(srrmd2);
- assertEquals("role with link", srrmd2.getDescription().getDefaultString());
- assertEquals("role avec link", srrmd2.getDescription().getString(fr, false));
+ assertEquals("role with link", srrmd2Description.getDefaultString());
+ assertEquals("role avec link", srrmd2Description.getString(fr, false));
assertEquals("ROLE_NAME_WITH_LINK", srrmd2.getRoleName());
assertEquals("ROLE_LINK", srrmd2.getRoleLink());
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/RenderParameterTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/RenderParameterTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/RenderParameterTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -22,8 +22,10 @@
******************************************************************************/
package org.jboss.portal.portlet.mc.metadata;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -66,7 +68,9 @@
assertEquals("http://someurl.alias.com", prp2.getAlias().get(0).getNamespaceURI());
assertEquals("s", prp2.getAlias().get(0).getPrefix());
- assertEquals("render parameter foo", prp1.getDescription().getDefaultString());
+ LocalizedString prp1Description = LocalizedStringAdapter.getLocalizedString(prp1.getDescription());
+
+ assertEquals("render parameter foo", prp1Description.getDefaultString());
}
catch (Exception e)
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -25,10 +25,12 @@
import java.util.Locale;
import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -54,21 +56,27 @@
SecurityConstraintMetaData scd1 = md.getSecurityConstraints().get(0);
assertNotNull(scd1);
- assertEquals("test", scd1.getDisplayName().getDefaultString());
- assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false));
- assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee());
+
+ LocalizedString scd1DisplayName = LocalizedStringAdapter.getLocalizedString(scd1.getDisplayName());
+ assertEquals("test", scd1DisplayName.getDefaultString());
+ assertEquals("Test", scd1DisplayName.getString(new Locale("de"), false));
+ assertEquals(TransportGuarantee.NONE, TransportGuarantee.valueOf(scd1.getUserDataConstraint().getTransportQuarantee()));
+
assertEquals("foo", scd1.getPortletList().getPortletNames().get(0));
assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1));
assertEquals("foo", scd1.getId());
SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1);
assertNotNull(scd2);
- assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee());
+ assertEquals(TransportGuarantee.INTEGRAL, TransportGuarantee.valueOf(scd2.getUserDataConstraint().getTransportQuarantee()));
assertEquals("foo", scd2.getPortletList().getPortletNames().get(0));
- assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString());
- assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false));
+ LocalizedString scd1UserDataConstraintDescription = LocalizedStringAdapter.getLocalizedString(scd1.getUserDataConstraint().getDescription());
+
+ assertEquals("fooConstraint", scd1UserDataConstraintDescription.getDefaultString());
+ assertEquals("FooConstraint", scd1UserDataConstraintDescription.getString(new Locale("de"), false));
+
try
{
scd2.getPortletList().getPortletNames().get(1);
@@ -144,22 +152,28 @@
SecurityConstraintMetaData scd1 = md.getSecurityConstraints().get(0);
assertNotNull(scd1);
- assertEquals("test", scd1.getDisplayName().getDefaultString());
- assertEquals("Test", scd1.getDisplayName().getString(new Locale("de"), false));
+
+ LocalizedString scd1DisplayName = LocalizedStringAdapter.getLocalizedString(scd1.getDisplayName());
+
+ assertEquals("test", scd1DisplayName.getDefaultString());
+ assertEquals("Test", scd1DisplayName.getString(new Locale("de"), false));
assertEquals("foo", scd1.getId());
- assertEquals(TransportGuarantee.NONE, scd1.getUserDataConstraint().getTransportQuarantee());
+ assertEquals(TransportGuarantee.NONE, TransportGuarantee.valueOf(scd1.getUserDataConstraint().getTransportQuarantee()));
assertEquals("foo", scd1.getPortletList().getPortletNames().get(0));
assertEquals("foobar", scd1.getPortletList().getPortletNames().get(1));
SecurityConstraintMetaData scd2 = md.getSecurityConstraints().get(1);
assertNotNull(scd2);
- assertEquals(TransportGuarantee.INTEGRAL, scd2.getUserDataConstraint().getTransportQuarantee());
+ assertEquals(TransportGuarantee.INTEGRAL, TransportGuarantee.valueOf(scd2.getUserDataConstraint().getTransportQuarantee()));
assertEquals("foo", scd2.getPortletList().getPortletNames().get(0));
- assertEquals("fooConstraint", scd1.getUserDataConstraint().getDescription().getDefaultString());
- assertEquals("FooConstraint", scd1.getUserDataConstraint().getDescription().getString(new Locale("de"), false));
+
+ LocalizedString scd1UserDataConstraintDescription = LocalizedStringAdapter.getLocalizedString(scd1.getUserDataConstraint().getDescription());
+ assertEquals("fooConstraint", scd1UserDataConstraintDescription.getDefaultString());
+ assertEquals("FooConstraint", scd1UserDataConstraintDescription.getString(new Locale("de"), false));
+
try
{
scd2.getPortletList().getPortletNames().get(1);
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/UserAttributeTestEverythingTestCase.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/UserAttributeTestEverythingTestCase.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/UserAttributeTestEverythingTestCase.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -24,9 +24,11 @@
import java.util.Locale;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.UserAttributeMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.unit.api.pojo.annotations.Test;
import static org.jboss.unit.api.Assert.*;
@@ -57,9 +59,12 @@
UserAttributeMetaData umd = md.getUserAttributes().get("foo");
assertNotNull(umd);
assertEquals("realFoo", umd.getId());
- assertEquals("foobar", umd.getDescription().getDefaultString());
- assertEquals("fuhbar", umd.getDescription().getString(new Locale("de"), true));
+ LocalizedString umdDescription = LocalizedStringAdapter.getLocalizedString(umd.getDescription());
+
+ assertEquals("foobar", umdDescription.getDefaultString());
+ assertEquals("fuhbar", umdDescription.getString(new Locale("de"), true));
+
}
catch (Exception e)
{
@@ -87,8 +92,11 @@
UserAttributeMetaData umd = md.getUserAttributes().get("foo");
assertNotNull(umd);
assertEquals("realFoo", umd.getId());
- assertEquals("foobar", umd.getDescription().getDefaultString());
- assertEquals("fuhbar", umd.getDescription().getString(new Locale("de"), true));
+
+ LocalizedString umdDescription = LocalizedStringAdapter.getLocalizedString(umd.getDescription());
+
+ assertEquals("foobar", umdDescription.getDefaultString());
+ assertEquals("fuhbar", umdDescription.getString(new Locale("de"), true));
}
catch (Exception e)
{
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/pom.xml 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/pom.xml 2009-03-10 22:42:35 UTC (rev 13015)
@@ -28,6 +28,10 @@
<artifactId>common-portal</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.portal.metadata</groupId>
+ <artifactId>metadata-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.portal.web</groupId>
<artifactId>web-web</artifactId>
</dependency>
@@ -207,4 +211,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -31,29 +31,32 @@
import org.jboss.portal.common.reflect.NoSuchClassException;
import org.jboss.portal.common.util.ConversionException;
import org.jboss.portal.portlet.LifeCyclePhase;
-import org.jboss.portal.portlet.impl.metadata.ListenerMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
-import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
-import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
-import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionReferenceMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletInfoMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletModeMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferencesMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SecurityRoleRefMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportedLocaleMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData;
+import org.jboss.portal.portlet.TransportGuarantee;
+import org.jboss.portal.metadata.portlet.ListenerMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.PublicRenderParameterMetaData;
+import org.jboss.portal.metadata.portlet.UserAttributeMetaData;
+import org.jboss.portal.metadata.portlet.CustomPortletModeMetaData;
+import org.jboss.portal.metadata.portlet.CustomWindowStateMetaData;
+import org.jboss.portal.metadata.portlet.common.ContainerRuntimeMetaData;
+import org.jboss.portal.metadata.portlet.common.InitParamMetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionMetaData;
+import org.jboss.portal.metadata.portlet.event.EventDefinitionReferenceMetaData;
+import org.jboss.portal.metadata.portlet.filter.FilterMappingMetaData;
+import org.jboss.portal.metadata.portlet.filter.FilterMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletInfoMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletModeMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletPreferenceMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletPreferencesMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SecurityRoleRefMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportedLocaleMetaData;
+import org.jboss.portal.metadata.portlet.portlet.SupportsMetaData;
+import org.jboss.portal.metadata.portlet.portlet.WindowStateMetaData;
+import org.jboss.portal.metadata.portlet.security.SecurityConstraintMetaData;
+import org.jboss.portal.portlet.impl.metadata.adapter.LifeCyclePhaseAdapter;
+import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
import org.jboss.portal.portlet.info.MetaInfo;
import javax.xml.XMLConstants;
@@ -456,7 +459,7 @@
Mode mode = Mode.create(customPortletModeMD.getPortletMode());
//
- LocalizedString description = customPortletModeMD.getDescription();
+ LocalizedString description = LocalizedStringAdapter.getLocalizedString(customPortletModeMD.getDescription());
//
ContainerModeInfo modeInfo;
@@ -499,7 +502,7 @@
WindowState windowState = WindowState.create(customPortletModeMD.getWindowState());
//
- LocalizedString description = customPortletModeMD.getDescription();
+ LocalizedString description = LocalizedStringAdapter.getLocalizedString(customPortletModeMD.getDescription());
//
ContainerWindowStateInfo windowStateInfo;
@@ -529,8 +532,8 @@
{
return new ContainerListenerInfo(
listenerMD.getListenerClass(),
- listenerMD.getDisplayName(),
- listenerMD.getDescription());
+ LocalizedStringAdapter.getLocalizedString(listenerMD.getDisplayName()),
+ LocalizedStringAdapter.getLocalizedString(listenerMD.getDescription()));
}
private ContainerFilterInfo build(FilterMetaData filterMD)
@@ -542,12 +545,17 @@
}
//
+ List<LifeCyclePhase> lifeCycles = LifeCyclePhaseAdapter.getLifeCycles(filterMD.getLifecycle());
+ LocalizedString displayName = LocalizedStringAdapter.getLocalizedString(filterMD.getDisplayName());
+ LocalizedString description = LocalizedStringAdapter.getLocalizedString(filterMD.getDescription());
+
+ //
return new ContainerFilterInfo(
filterMD.getFilterName(),
filterMD.getFilterClass(),
- Collections.unmodifiableSet(new HashSet<LifeCyclePhase>(filterMD.getLifecycle())),
- filterMD.getDisplayName(),
- filterMD.getDescription(),
+ Collections.unmodifiableSet(new HashSet<LifeCyclePhase>(lifeCycles)),
+ displayName,
+ description,
Collections.unmodifiableMap(initParameters)
);
}
@@ -828,7 +836,7 @@
{
if (securityConstraintMD.getPortletList().getPortletNames().contains(portletMD.getPortletName()))
{
- containerSecurity.addTransportGuarantee(securityConstraintMD.getUserDataConstraint().getTransportQuarantee());
+ containerSecurity.addTransportGuarantee(TransportGuarantee.valueOf(securityConstraintMD.getUserDataConstraint().getTransportQuarantee()));
}
}
@@ -882,7 +890,7 @@
// Then process each mode
for (PortletModeMetaData modeMD : supportsMD.getPortletModes())
{
- ContainerModeInfo mode = customModes.get(modeMD.getPortletMode());
+ ContainerModeInfo mode = customModes.get(Mode.create(modeMD.getPortletMode()));
//
if (mode != null)
@@ -891,14 +899,14 @@
}
else
{
- capabilities.add(mimeType, modeMD.getPortletMode());
+ capabilities.add(mimeType, Mode.create(modeMD.getPortletMode()));
}
}
// then process window states
for (WindowStateMetaData windowStateMD : supportsMD.getWindowStates())
{
- ContainerWindowStateInfo windowStateInfo = customWindowStates.get(windowStateMD.getWindowState());
+ ContainerWindowStateInfo windowStateInfo = customWindowStates.get(WindowState.create(windowStateMD.getWindowState()));
//
if (windowStateInfo != null)
@@ -907,7 +915,7 @@
}
else
{
- capabilities.add(mimeType, windowStateMD.getWindowState());
+ capabilities.add(mimeType, WindowState.create(windowStateMD.getWindowState()));
}
}
@@ -994,8 +1002,8 @@
}
// Add stuff coming from deployment descriptor
- containerMeta.addMetaValue(MetaInfo.DESCRIPTION, portletMD.getDescription());
- containerMeta.addMetaValue(MetaInfo.DISPLAY_NAME, portletMD.getDisplayName());
+ containerMeta.addMetaValue(MetaInfo.DESCRIPTION, LocalizedStringAdapter.getLocalizedString(portletMD.getDescription()));
+ containerMeta.addMetaValue(MetaInfo.DISPLAY_NAME, LocalizedStringAdapter.getLocalizedString(portletMD.getDisplayName()));
//
return containerMeta;
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilderContext.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -24,7 +24,7 @@
import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.common.reflect.NoSuchClassException;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ContainerInfoBuilderContextImpl.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication10MetaData;
+import org.jboss.portal.metadata.portlet.PortletApplication20MetaData;
+import org.jboss.portal.metadata.portlet.portlet.PortletMetaData;
import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext;
import org.jboss.portal.web.WebApp;
import org.jboss.portal.common.i18n.ResourceBundleManager;
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomPortletModeMetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomPortletModeMetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomPortletModeMetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,89 +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.impl.metadata;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
- at XmlType(name = "custom-portlet-modeType")
-public class CustomPortletModeMetaData extends DescribableMetaData
-{
-
- /** The custom portlet mode id*/
- private String id;
-
- /** The portlet mode */
- private String portletMode;
-
- /** Is portal managed */
- private boolean portalManaged = true;
-
- public CustomPortletModeMetaData() {}
-
- public CustomPortletModeMetaData(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlElement(name = "portlet-mode")
- public String getPortletMode()
- {
- return portletMode;
- }
-
- public void setPortletMode(String portletMode)
- {
- this.portletMode = portletMode;
- }
-
- @XmlElement(name = "portal-managed", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public boolean isPortalManaged()
- {
- return portalManaged;
- }
-
- public void setPortalManaged(boolean portalManaged)
- {
- this.portalManaged = portalManaged;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomWindowStateMetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomWindowStateMetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/CustomWindowStateMetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,74 +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.impl.metadata;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
- at XmlType(name = "custom-window-stateType")
-public class CustomWindowStateMetaData extends DescribableMetaData
-{
-
- /** The window state id */
- private String id;
-
- /** The window state */
- private String windowState;
-
- public CustomWindowStateMetaData() {}
-
- public CustomWindowStateMetaData(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlElement(name = "window-state")
- public String getWindowState()
- {
- return windowState;
- }
-
- public void setWindowState(String windowState)
- {
- this.windowState = windowState;
- }
-
-}
\ No newline at end of file
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ListenerMetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ListenerMetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ListenerMetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,95 +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.impl.metadata;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter;
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
- at XmlType(name = "listenerType")
-public class ListenerMetaData extends DescribableMetaData
-{
-
- /** The id */
- private String id;
-
- /** The display name */
- private LocalizedString displayName;
-
- /** The listener class */
- private String listenerClass;
-
- public ListenerMetaData() {}
-
- public ListenerMetaData(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlElement(name = "display-name")
- @XmlJavaTypeAdapter(LocalizedStringAdapter.class)
- public LocalizedString getDisplayName()
- {
- return displayName;
- }
-
- public void setDisplayName(LocalizedString displayName)
- {
- this.displayName = displayName;
- }
-
- @XmlElement(name = "listener-class")
- @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
- public String getListenerClass()
- {
- return listenerClass;
- }
-
- public void setListenerClass(String listenerClass)
- {
- this.listenerClass = listenerClass;
- }
-
-}
-
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication10MetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,220 +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.impl.metadata;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.adapter.CustomPortletModeAdapter;
-import org.jboss.portal.portlet.impl.metadata.adapter.CustomWindowStateAdapter;
-import org.jboss.portal.portlet.impl.metadata.adapter.PortletListAdapter;
-import org.jboss.portal.portlet.impl.metadata.adapter.UserAttributeAdapter;
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData;
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
-import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
-import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-
- at XmlRootElement(name = "portlet-app")
- at XmlType(name = "portlet-appType")
-public class 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;
-
- @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)
- {
- // Adding reference to the portlet application metadata
- for( PortletMetaData p : portlets.values())
- {
- p.setPortletApplication(this);
- }
- 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>();
- }
- // Adding reference to the portlet application metadata
- portlet.setPortletApplication(this);
- 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);
- }
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication20MetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication20MetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletApplication20MetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,238 +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.impl.metadata;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.adapter.ContainerRuntimeAdapter;
-import org.jboss.portal.portlet.impl.metadata.adapter.FilterAdapter;
-import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData;
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class PortletApplication20MetaData extends PortletApplication10MetaData
-{
- /** The resource bundle (JSR 286) */
- private String resourceBundle;
-
- /** The default namespace URI (JSR 286) */
- private URI defaultNamespace;
-
- /** The filters (JSR 286) */
- private Map<String, FilterMetaData> filters;
-
- /** The filter mapping (JSR 286) */
- private List<FilterMappingMetaData> filterMapping;
-
- /** The events (JSR 286) */
- private List<EventDefinitionMetaData> events;
-
- /** The public render parameters */
- private List<PublicRenderParameterMetaData> publicRenderParameters;
-
- /** The url generation listener */
- private List<ListenerMetaData> listeners;
-
- /** The container runtime options */
- private Map<String, ContainerRuntimeMetaData> containerRuntimeOptions;
-
- @XmlElement(name = "resource-bundle", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public String getResourceBundle()
- {
- return resourceBundle;
- }
-
- public void setResourceBundle(String resourceBundle)
- {
- this.resourceBundle = resourceBundle;
- }
-
- @XmlElement(name = "default-namespace")
- public URI getDefaultNamespace()
- {
- return defaultNamespace;
- }
-
- public void setDefaultNamespace(URI defaultNamespace)
- {
- this.defaultNamespace = defaultNamespace;
- }
-
- @XmlElement(name = "filter", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- @XmlJavaTypeAdapter(FilterAdapter.class)
- public Map<String, FilterMetaData> getFilters()
- {
- return this.filters;
- }
-
- public void setFilters(Map<String, FilterMetaData> filters)
- {
- this.filters = filters;
- }
-
- public Collection<FilterMetaData> getFilterCollection()
- {
- return this.filters != null ? this.filters.values() : null;
- }
-
- public FilterMetaData getFilter(String filterName)
- {
- return this.filters.get(filterName);
- }
-
- public void addFilter(FilterMetaData filter)
- {
- if ( this.filters == null)
- {
- this.filters = new LinkedHashMap<String, FilterMetaData>();
- }
- this.filters.put(filter.getFilterName(), filter);
- }
-
- @XmlElement(name = "filter-mapping", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public List<FilterMappingMetaData> getFilterMapping()
- {
- return filterMapping;
- }
-
- public void setFilterMapping(List<FilterMappingMetaData> filterMapping)
- {
- this.filterMapping = filterMapping;
- }
-
- public void addFilterMapping(FilterMappingMetaData filterMapping)
- {
- if(this.filterMapping == null)
- {
- this.filterMapping = new ArrayList<FilterMappingMetaData>();
- }
- this.filterMapping.add(filterMapping);
- }
-
- @XmlElement(name = "event-definition", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public List<EventDefinitionMetaData> getEvents()
- {
- return events;
- }
-
- public void setEvents(List<EventDefinitionMetaData> events)
- {
- this.events = events;
- }
-
- public void addEventDefinition(EventDefinitionMetaData eventDefinition)
- {
- if(this.events == null)
- {
- this.events = new ArrayList<EventDefinitionMetaData>();
- }
- this.events.add(eventDefinition);
- }
-
- @XmlElement(name = "public-render-parameter", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public List<PublicRenderParameterMetaData> getPublicRenderParameters()
- {
- return publicRenderParameters;
- }
-
- public void setPublicRenderParameters(List<PublicRenderParameterMetaData> publicRenderParameters)
- {
- this.publicRenderParameters = publicRenderParameters;
- }
-
- public void addPublicRenderParameter(PublicRenderParameterMetaData renderParameter)
- {
- if( this.publicRenderParameters == null)
- {
- this.publicRenderParameters = new ArrayList<PublicRenderParameterMetaData>();
- }
- this.publicRenderParameters.add(renderParameter);
- }
-
- @XmlElement(name = "listener", namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- public List<ListenerMetaData> getListeners()
- {
- return listeners;
- }
-
- public void setListeners(List<ListenerMetaData> listeners)
- {
- this.listeners = listeners;
- }
-
- public void addListener(ListenerMetaData listener)
- {
- if (this.listeners == null)
- {
- this.listeners = new ArrayList<ListenerMetaData>();
- }
- this.listeners.add(listener);
- }
-
- @XmlElement(name = "container-runtime-option",
- namespace = PortletMetaDataConstants.PORTLET_JSR_286_NS)
- @XmlJavaTypeAdapter(ContainerRuntimeAdapter.class)
- public Map<String, ContainerRuntimeMetaData> getContainerRuntimeOptions()
- {
- return containerRuntimeOptions;
- }
-
- public void setContainerRuntimeOptions(Map<String, ContainerRuntimeMetaData> containerRuntimeOptions)
- {
- this.containerRuntimeOptions = containerRuntimeOptions;
- }
-
- public ContainerRuntimeMetaData getContainerRuntimeOption(String option)
- {
- return this.containerRuntimeOptions.get(option);
- }
-
- public Set<String> getContainerRuntimeOptionSet()
- {
- return this.containerRuntimeOptions != null ? this.containerRuntimeOptions.keySet() : null;
- }
-
- public void addContainerRuntime(ContainerRuntimeMetaData option)
- {
- if (this.containerRuntimeOptions == null)
- {
- this.containerRuntimeOptions = new HashMap<String, ContainerRuntimeMetaData>();
- }
- this.containerRuntimeOptions.put(option.getName(), option);
- }
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletMetaDataConstants.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletMetaDataConstants.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PortletMetaDataConstants.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,45 +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.impl.metadata;
-
-import static javax.xml.XMLConstants.XML_NS_URI;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public final class PortletMetaDataConstants
-{
-
- /** The portlet version 1.0 namespace */
- public final static String PORTLET_JSR_168_NS = "http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd";
-
- /** The portlet version 2.0 namespace */
- public final static String PORTLET_JSR_286_NS = "http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd";
-
- /** The xml namespace */
- public final static String NS_XML_NAMESPACE = XML_NS_URI;
-
- /** The default locale */
- public final static String DEFAULT_LOCALE = "en";
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PublicRenderParameterMetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PublicRenderParameterMetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/PublicRenderParameterMetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,129 +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.impl.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
-
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
- at XmlType(name = "public-render-parameterType")
-public class PublicRenderParameterMetaData extends DescribableMetaData
-{
-
- /** The public render parameter id */
- private String id;
-
- /** The public render parameter identifier */
- private String identifier;
-
- /** The QName */
- private QName qname;
-
- /** The name */
- private String name;
-
- /** The public render parameter alias */
- private List<QName> alias;
-
- public PublicRenderParameterMetaData() {}
-
- public PublicRenderParameterMetaData(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlElement(name = "identifier")
- public String getIdentifier()
- {
- return identifier;
- }
-
- public void setIdentifier(String identifier)
- {
- this.identifier = identifier;
- }
-
- @XmlElement(name = "qname")
- public QName getQname()
- {
- return qname;
- }
-
- public void setQname(QName qname)
- {
- this.qname = qname;
- }
-
- @XmlElement(name = "name")
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlElement(name = "alias")
- public List<QName> getAlias()
- {
- return alias;
- }
-
- public void setAlias(List<QName> alias)
- {
- this.alias = alias;
- }
-
- public void addAlias(QName alias)
- {
- if(this.alias == null)
- {
- this.alias = new ArrayList<QName>();
- }
- this.alias.add(alias);
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/UserAttributeMetaData.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/UserAttributeMetaData.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/UserAttributeMetaData.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,74 +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.impl.metadata;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
- at XmlType(name = "user-attributeType")
-public class UserAttributeMetaData extends DescribableMetaData
-{
-
- /** The id */
- private String id;
-
- /** The name */
- private String name;
-
- public UserAttributeMetaData() {}
-
- public UserAttributeMetaData(String id)
- {
- this.id = id;
- }
-
- @XmlAttribute(name = "id")
- public String getId()
- {
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- @XmlElement(name = "name")
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-}
-
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ValidationErrorHandler.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ValidationErrorHandler.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/ValidationErrorHandler.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,52 +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.impl.metadata;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class ValidationErrorHandler implements ErrorHandler
-{
-
- public void error(SAXParseException e) throws SAXException
- {
- throw new SAXException("Syntax error on line: " + e.getLineNumber() + ", column: " + e.getColumnNumber() + "\n"
- + e.getMessage());
- }
-
- public void fatalError(SAXParseException e) throws SAXException
- {
- throw new SAXException("Fatal syntax error on line: " + e.getLineNumber() + ", column: " + e.getColumnNumber()
- + "\n" + e.getMessage());
- }
-
- public void warning(SAXParseException e) throws SAXException
- {
- // TODO - maybe logging or similar stuff
- }
-
-}
\ No newline at end of file
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/ContainerRuntimeAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,58 +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.impl.metadata.adapter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.common.ContainerRuntimeMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class ContainerRuntimeAdapter
- extends XmlAdapter<List<ContainerRuntimeMetaData>, java.util.Map<String, ContainerRuntimeMetaData>>
-{
-
- @Override
- public List<ContainerRuntimeMetaData> marshal(Map<String, ContainerRuntimeMetaData> map) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, ContainerRuntimeMetaData> unmarshal(List<ContainerRuntimeMetaData> list) throws Exception
- {
- Map<String, ContainerRuntimeMetaData> map = new HashMap<String, ContainerRuntimeMetaData>();
- for (ContainerRuntimeMetaData c : list)
- {
- map.put(c.getName(), c);
- }
- return map;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomPortletModeAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,58 +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.impl.metadata.adapter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class CustomPortletModeAdapter extends XmlAdapter<List<CustomPortletModeMetaData>, Map<String, CustomPortletModeMetaData>>
-{
-
- @Override
- public List<CustomPortletModeMetaData> marshal(Map<String, CustomPortletModeMetaData> map) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, CustomPortletModeMetaData> unmarshal(List<CustomPortletModeMetaData> list) throws Exception
- {
- Map<String, CustomPortletModeMetaData> map = new LinkedHashMap<String, CustomPortletModeMetaData>();
- for (CustomPortletModeMetaData md : list)
- {
- map.put(md.getPortletMode(), md);
- }
- return map;
- }
-
-}
-
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/CustomWindowStateAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,58 +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.impl.metadata.adapter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class CustomWindowStateAdapter extends XmlAdapter<List<CustomWindowStateMetaData>, Map<String, CustomWindowStateMetaData>>
-{
-
- @Override
- public List<CustomWindowStateMetaData> marshal(Map<String, CustomWindowStateMetaData> map) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, CustomWindowStateMetaData> unmarshal(List<CustomWindowStateMetaData> list) throws Exception
- {
- Map<String, CustomWindowStateMetaData> map = new LinkedHashMap<String, CustomWindowStateMetaData>();
- for(CustomWindowStateMetaData md : list)
- {
- map.put(md.getWindowState(), md);
- }
- return map;
- }
-
-}
-
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/EventListAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,57 +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.impl.metadata.adapter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.event.EventDefinitionMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public final class EventListAdapter
- extends XmlAdapter<EventDefinitionMetaData[], Map<String, EventDefinitionMetaData>>
-{
-
- @Override
- public EventDefinitionMetaData[] marshal(Map<String, EventDefinitionMetaData> eventMap) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, EventDefinitionMetaData> unmarshal(EventDefinitionMetaData[] eventList) throws Exception
- {
- Map<String, EventDefinitionMetaData> eventMap = new HashMap<String, EventDefinitionMetaData>();
- for (EventDefinitionMetaData eventDef : eventList)
- {
- eventMap.put(eventDef.getQname().getLocalPart(), eventDef);
- }
- return eventMap;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/FilterAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,66 +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.impl.metadata.adapter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class FilterAdapter
- extends XmlAdapter<List<FilterMetaData>, Map<String, FilterMetaData>>
-{
-
- @Override
- public List<FilterMetaData> marshal(Map<String, FilterMetaData> map) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, FilterMetaData> unmarshal(List<FilterMetaData> list) throws Exception
- {
- Map<String, FilterMetaData> map = new LinkedHashMap<String, FilterMetaData>();
- for (FilterMetaData f : list)
- {
- String filterName = f.getFilterName();
- if (!map.containsKey(filterName))
- {
- map.put(filterName, f);
- }
- else
- {
- throw new IllegalArgumentException("Duplicate filter: " + filterName);
- }
- }
- return map;
- }
-
-}
Added: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LifeCyclePhaseAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LifeCyclePhaseAdapter.java (rev 0)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LifeCyclePhaseAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.impl.metadata.adapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jboss.portal.portlet.LifeCyclePhase;
+
+/**
+ * @author <a href="mailto:mwringe at redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class LifeCyclePhaseAdapter
+{
+ public static List<LifeCyclePhase> getLifeCycles (List<String> lifecycleStrings)
+ {
+ List<LifeCyclePhase> lifeCyclePhases = new ArrayList<LifeCyclePhase>();
+ for (String lifecycleString : lifecycleStrings)
+ {
+ LifeCyclePhase lifeCyclePhase = LifeCyclePhase.valueOf(lifecycleString);
+ lifeCyclePhases.add(lifeCyclePhase);
+ }
+ return lifeCyclePhases;
+ }
+
+
+}
+
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/LocalizedStringAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -27,37 +27,46 @@
import java.util.Locale;
import java.util.Map;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
+import org.apache.log4j.Logger;
import org.jboss.portal.common.i18n.LocaleFormat;
import org.jboss.portal.common.i18n.LocalizedString;
-import static org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants.*;
-import org.jboss.portal.portlet.impl.metadata.common.LocalizedDescriptionMetaData;
+import org.jboss.portal.common.util.ConversionException;
+import static org.jboss.portal.metadata.portlet.PortletMetaDataConstants.*;
+import org.jboss.portal.metadata.portlet.common.LocalizedDescriptionMetaData;
+
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
public class LocalizedStringAdapter
- extends XmlAdapter<List<LocalizedDescriptionMetaData>, LocalizedString>
+
{
-
- @Override
- public List<LocalizedDescriptionMetaData> marshal(LocalizedString arg0) throws Exception
+ public static LocalizedString getLocalizedString(List<LocalizedDescriptionMetaData> descriptionList)
{
- throw new UnsupportedOperationException();
- }
-
- @Override
- public LocalizedString unmarshal(List<LocalizedDescriptionMetaData> descriptionList) throws Exception
- {
- Map<Locale, String> map = new LinkedHashMap<Locale, String>();
- for (LocalizedDescriptionMetaData d : descriptionList)
+ if (descriptionList != null)
{
- Locale locale = LocaleFormat.DEFAULT.getLocale(d.getLang());
- map.put(locale, d.getDescription());
+ Map<Locale, String> map = new LinkedHashMap<Locale, String>();
+ try
+ {
+ for (LocalizedDescriptionMetaData d : descriptionList)
+ {
+ Locale locale = LocaleFormat.DEFAULT.getLocale(d.getLang());
+ map.put(locale, d.getDescription());
+ }
+ }
+ catch (ConversionException ce)
+ {
+ Logger log = Logger.getLogger(LocalizedStringAdapter.class);
+ log.warn("Conversion exception occured when trying to get locale." + ce.getStackTrace());
+ }
+ return new LocalizedString(map, new Locale(DEFAULT_LOCALE));
}
- return new LocalizedString(map, new Locale(DEFAULT_LOCALE));
+ else
+ {
+ return null;
+ }
}
+
}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletListAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,65 +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.impl.metadata.adapter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public final class PortletListAdapter
- extends XmlAdapter<List<PortletMetaData>, Map<String, PortletMetaData>>
-{
-
- @Override
- public List<PortletMetaData> marshal(Map<String, PortletMetaData> portletMap) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, PortletMetaData> unmarshal(List<PortletMetaData> portletList) throws Exception
- {
- Map<String, PortletMetaData> portletMap = new LinkedHashMap<String, PortletMetaData>();
- for (PortletMetaData portlet : portletList)
- {
- if (!portletMap.containsKey(portlet.getPortletName()))
- {
- portletMap.put(portlet.getPortletName(), portlet);
- }
- else
- {
- throw new IllegalArgumentException("Portlet name '" + portlet.getPortletName() + "' already defined.");
- }
- }
- return portletMap;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletModeAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,49 +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.impl.metadata.adapter;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.Mode;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class PortletModeAdapter extends XmlAdapter<String, Mode>
-{
-
- @Override
- public String marshal(Mode mode) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Mode unmarshal(String name) throws Exception
- {
- return Mode.create(name);
- }
-
-}
-
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/PortletPreferencesListAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,58 +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.impl.metadata.adapter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.portlet.PortletPreferenceMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class PortletPreferencesListAdapter
- extends XmlAdapter<List<PortletPreferenceMetaData>, Map<String, PortletPreferenceMetaData>>
-{
-
- @Override
- public List<PortletPreferenceMetaData> marshal(Map<String, PortletPreferenceMetaData> arg0) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, PortletPreferenceMetaData> unmarshal(List<PortletPreferenceMetaData> list) throws Exception
- {
- Map<String, PortletPreferenceMetaData> map = new LinkedHashMap<String, PortletPreferenceMetaData>();
- for (PortletPreferenceMetaData p : list)
- {
- map.put(p.getName(), p);
- }
- return map;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/UserAttributeAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,67 +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.impl.metadata.adapter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-
-public class UserAttributeAdapter
- extends XmlAdapter<List<UserAttributeMetaData>, Map<String, UserAttributeMetaData>>
-{
-
- @Override
- public List<UserAttributeMetaData> marshal(Map<String, UserAttributeMetaData> arg0) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public Map<String, UserAttributeMetaData> unmarshal(List<UserAttributeMetaData> list) throws Exception
- {
- HashMap<String, UserAttributeMetaData> m = new HashMap<String, UserAttributeMetaData>();
- for (UserAttributeMetaData a : list)
- {
- String userAttributeName = a.getName();
- if (!m.containsKey(userAttributeName))
- {
- m.put(a.getName(), a);
- }
- else
- {
- throw new IllegalArgumentException("Duplicate user-attribute: " + userAttributeName);
- }
- }
- return m;
- }
-
-}
Deleted: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/adapter/WindowStateAdapter.java 2009-03-10 22:42:35 UTC (rev 13015)
@@ -1,49 +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.impl.metadata.adapter;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-import org.jboss.portal.WindowState;
-
-/**
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class WindowStateAdapter extends XmlAdapter<String, WindowState>
-{
-
- @Override
- public String marshal(WindowState arg0) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public WindowState unmarshal(String name) throws Exception
- {
- return WindowState.create(name);
- }
-
-}
-
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/pom.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/pom.xml 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/pom.xml 2009-03-10 22:42:35 UTC (rev 13015)
@@ -256,6 +256,8 @@
<property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/>
<property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/>
+ <property name="dependency.portal-metadata-metadata.jar" value="${maven.dependency.org.jboss.portal.metadata.metadata-metadata.jar.path}"/>
+
<property name="dependency.portal-web-web.jar" value="${maven.dependency.org.jboss.portal.web.web-web.jar.path}"/>
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.jar.path}"/>
Modified: modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/src/test/build.xml
===================================================================
--- modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/src/test/build.xml 2009-03-10 21:33:59 UTC (rev 13014)
+++ modules/portlet/branches/JBP_PORTLET_AS5_Deployer/test/src/test/build.xml 2009-03-10 22:42:35 UTC (rev 13015)
@@ -73,6 +73,10 @@
<pathelement path="${dependency.portal-common-common.jar}"/>
</path>
+ <path id="portal-metadata">
+ <pathelement path="${dependency.portal-metadata-metadata.jar}"/>
+ </path>
+
<path id="portal-web">
</path>
@@ -112,6 +116,7 @@
</path>
<path id="jboss-4.2-shared">
+ <path refid="portal-metadata"/>
<path refid="portal-common-shared"/>
<path refid="portal-web-shared"/>
<path refid="portal-portlet-shared"/>
@@ -149,6 +154,7 @@
</path>
<path id="tomcat-6.0-shared">
+ <path refid="portal-metadata"/>
<path refid="portal-common-shared"/>
<path refid="portal-web-shared"/>
<path refid="portal-portlet-shared"/>
More information about the portal-commits
mailing list