You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2008/04/11 11:38:23 UTC
svn commit: r647088 [5/5] - in /portals/pluto/branches/2.0-spi-refactoring:
pluto-container-api/
pluto-container-api/src/main/java/org/apache/pluto/om/common/
pluto-container-api/src/main/java/org/apache/pluto/om/portlet/
pluto-container-api/src/main/j...
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/jaxb/JaxBDescriptorServiceImplTest.java Fri Apr 11 02:37:29 2008
@@ -24,8 +24,8 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -313,16 +313,16 @@
InputStream in = new ByteArrayInputStream(xml286.toString().getBytes());
- PortletAppDD portletApp286 = jaxb.read(in);
+ PortletApp portletApp286 = jaxb.read(in);
in = new ByteArrayInputStream(xml168.toString().getBytes());
- PortletAppDD portletApp168 = jaxb.read(in);
+ PortletApp portletApp168 = jaxb.read(in);
// test if portlet has the right params:
// test jsr168 compliant portlets
- PortletDD portlet168 = (PortletDD)portletApp168.getPortlets().get(0);
- assertTrue(portlet168.getExpirationCacheDD().getExpirationTime()==-1);
+ Portlet portlet168 = (Portlet)portletApp168.getPortlets().get(0);
+ assertTrue(portlet168.getExpirationCache().getExpirationTime()==-1);
assertEquals(portlet168.getPortletName(),"portlet168");
assertEquals(portlet168.getInitParams().get(0).getParamValue(),"value");
assertEquals(portlet168.getSecurityRoleRefs().get(0).getRoleLink(), "role-link");
@@ -336,7 +336,7 @@
// assertTrue(portletApp.getId().equals("id1"));
// portlet id
- PortletDD portlet286 = (PortletDD)portletApp286.getPortlets().get(0);
+ Portlet portlet286 = (Portlet)portletApp286.getPortlets().get(0);
// assertTrue(portlet1.getId().equals("id2"));
// portlet class
@@ -394,24 +394,24 @@
public void testParseNoExpirationCache168() throws IOException {
InputStream inputStream = new ByteArrayInputStream(portlet168NoCache.toString().getBytes());
- PortletAppDD portletDD = jaxb.read( inputStream );
+ PortletApp portletDD = jaxb.read( inputStream );
assertEquals( "1.0", portletDD.getVersion() );
assertEquals( 1, portletDD.getPortlets().size() );
- PortletDD pd = (PortletDD) portletDD.getPortlets().get( 0 );
- assertNull( pd.getExpirationCacheDD() );
+ Portlet pd = (Portlet) portletDD.getPortlets().get( 0 );
+ assertNull( pd.getExpirationCache() );
}
public void testParseNoExpirationCache286() throws IOException {
InputStream inputStream = new ByteArrayInputStream(portlet286NoCache.toString().getBytes());
- PortletAppDD portletDD = jaxb.read( inputStream );
+ PortletApp portletDD = jaxb.read( inputStream );
assertEquals( "2.0", portletDD.getVersion() );
assertEquals( 1, portletDD.getPortlets().size() );
- PortletDD pd = (PortletDD) portletDD.getPortlets().get( 0 );
- assertNull( pd.getExpirationCacheDD() );
+ Portlet pd = (Portlet) portletDD.getPortlets().get( 0 );
+ assertNull( pd.getExpirationCache() );
}
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Fri Apr 11 02:37:29 2008
@@ -47,8 +47,6 @@
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.core.PortletContainerImpl;
-import org.apache.pluto.descriptors.portlet.EventDefinitionDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
@@ -61,6 +59,9 @@
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.impl.EventImpl;
import org.apache.pluto.internal.impl.InternalPortletWindowImpl;
+import org.apache.pluto.om.portlet.EventDefinition;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.optional.PortletRegistryService;
@@ -264,13 +265,13 @@
for (PortletWindowConfig portlet : portlets) {
String contextPath = portlet.getContextPath();
- PortletAppDD portletAppDD = null;
+ PortletApp portletAppDD = null;
try {
portletAppDD = container
.getPortletApplicationDescriptor(contextPath);
List<PortletDD> portletDDs = portletAppDD.getPortlets();
List<QName> aliases = getAllAliases(eventName, portletAppDD);
- for (PortletDD portletDD : portletDDs) {
+ for (Portlet portletDD : portletDDs) {
List<QName> processingEvents = portletDD
.getProcessingEvents();
if ((processingEvents != null)
@@ -338,10 +339,10 @@
return resultList;
}
- private List<QName> getAllAliases(QName eventName, PortletAppDD portletAppDD) {
+ private List<QName> getAllAliases(QName eventName, PortletApp portletAppDD) {
if (portletAppDD.getEvents() != null) {
- for (EventDefinitionDD def : portletAppDD.getEvents()){
+ for (EventDefinition def : portletAppDD.getEvents()){
if (def.getQName() != null){
if (def.getQName().equals(eventName))
return def.getAlias();
@@ -526,7 +527,7 @@
if (events != null) {
String contextPath = portletWindow.getContextPath();
try {
- PortletAppDD portletAppDD = container
+ PortletApp portletAppDD = container
.getPortletApplicationDescriptor(contextPath);
String defaultNamespace = portletAppDD.getDefaultNamespace();
if (defaultNamespace == null) {
@@ -550,7 +551,7 @@
private boolean isValueInstanceOfDefinedClass(QName qname,
Serializable value) {
- PortletAppDD portletAppDD = null;
+ PortletApp portletAppDD = null;
try {
portletAppDD = container
.getPortletApplicationDescriptor(portletWindow
@@ -558,7 +559,7 @@
if (portletAppDD.getEvents() != null) {
- for (EventDefinitionDD def : portletAppDD.getEvents()){
+ for (EventDefinition def : portletAppDD.getEvents()){
if (def.getQName() != null){
if (def.getQName().equals(qname))
return value.getClass().getName().equals(
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterChainImpl.java Fri Apr 11 02:37:29 2008
@@ -41,7 +41,7 @@
import javax.portlet.filter.RenderFilter;
import javax.portlet.filter.ResourceFilter;
-import org.apache.pluto.descriptors.portlet.FilterDD;
+import org.apache.pluto.om.portlet.Filter;
/**
* A <code>FilterChain</code> is an object provided by the portlet container
@@ -54,7 +54,7 @@
*/
public class FilterChainImpl implements FilterChain {
- private List<FilterDD> filterList = new ArrayList<FilterDD>();
+ private List<Filter> filterList = new ArrayList<Filter>();
private String lifeCycle;
Portlet portlet;
EventPortlet eventPortlet;
@@ -91,20 +91,20 @@
}
}
- public void addFilter(FilterDD filterDD){
- filterList.add(filterDD);
+ public void addFilter(Filter filter){
+ filterList.add(filter);
}
public void doFilter(ActionRequest request, ActionResponse response) throws IOException, PortletException {
if (filterListIndex <filterList.size()){
- FilterDD filterDD = filterList.get(filterListIndex);
+ Filter filter = filterList.get(filterListIndex);
filterListIndex++;
try {
- ActionFilter filter = (ActionFilter) loader.loadClass(filterDD.getFilterClass()).newInstance();
- FilterConfigImpl filterConfig = new FilterConfigImpl(filterDD.getFilterName(),filterDD.getInitParam(),portletContext);
- filter.init(filterConfig);
- filter.doFilter(request, response, this);
- filter.destroy();
+ ActionFilter actionFilter = (ActionFilter) loader.loadClass(filter.getFilterClass()).newInstance();
+ FilterConfigImpl filterConfig = new FilterConfigImpl(filter.getFilterName(),filter.getInitParam(),portletContext);
+ actionFilter.init(filterConfig);
+ actionFilter.doFilter(request, response, this);
+ actionFilter.destroy();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
@@ -120,14 +120,14 @@
public void doFilter(EventRequest request, EventResponse response) throws IOException, PortletException {
if (filterListIndex <filterList.size()){
- FilterDD filterDD = filterList.get(filterListIndex);
+ Filter filter = filterList.get(filterListIndex);
filterListIndex++;
try {
- EventFilter filter = (EventFilter) loader.loadClass(filterDD.getFilterClass()).newInstance();
- FilterConfigImpl filterConfig = new FilterConfigImpl(filterDD.getFilterName(),filterDD.getInitParam(),portletContext);
- filter.init(filterConfig);
- filter.doFilter(request, response, this);
- filter.destroy();
+ EventFilter eventFilter = (EventFilter) loader.loadClass(filter.getFilterClass()).newInstance();
+ FilterConfigImpl filterConfig = new FilterConfigImpl(filter.getFilterName(),filter.getInitParam(),portletContext);
+ eventFilter.init(filterConfig);
+ eventFilter.doFilter(request, response, this);
+ eventFilter.destroy();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
@@ -143,14 +143,14 @@
public void doFilter(RenderRequest request, RenderResponse response) throws IOException, PortletException {
if (filterListIndex <filterList.size()){
- FilterDD filterDD = filterList.get(filterListIndex);
+ Filter filter = filterList.get(filterListIndex);
filterListIndex++;
try {
- RenderFilter filter = (RenderFilter) loader.loadClass(filterDD.getFilterClass()).newInstance();
- FilterConfigImpl filterConfig = new FilterConfigImpl(filterDD.getFilterName(),filterDD.getInitParam(),portletContext);
- filter.init(filterConfig);
- filter.doFilter(request, response, this);
- filter.destroy();
+ RenderFilter renderFilter = (RenderFilter) loader.loadClass(filter.getFilterClass()).newInstance();
+ FilterConfigImpl filterConfig = new FilterConfigImpl(filter.getFilterName(),filter.getInitParam(),portletContext);
+ renderFilter.init(filterConfig);
+ renderFilter.doFilter(request, response, this);
+ renderFilter.destroy();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
@@ -166,14 +166,14 @@
public void doFilter(ResourceRequest request, ResourceResponse response) throws IOException, PortletException {
if (filterListIndex <filterList.size()){
- FilterDD filterDD = filterList.get(filterListIndex);
+ Filter filter = filterList.get(filterListIndex);
filterListIndex++;
try {
- ResourceFilter filter = (ResourceFilter) loader.loadClass(filterDD.getFilterClass()).newInstance();
- FilterConfigImpl filterConfig = new FilterConfigImpl(filterDD.getFilterName(),filterDD.getInitParam(),portletContext);
- filter.init(filterConfig);
- filter.doFilter(request, response, this);
- filter.destroy();
+ ResourceFilter resourceFilter = (ResourceFilter) loader.loadClass(filter.getFilterClass()).newInstance();
+ FilterConfigImpl filterConfig = new FilterConfigImpl(filter.getFilterName(),filter.getInitParam(),portletContext);
+ resourceFilter.init(filterConfig);
+ resourceFilter.doFilter(request, response, this);
+ resourceFilter.destroy();
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterConfigImpl.java Fri Apr 11 02:37:29 2008
@@ -24,6 +24,7 @@
import javax.portlet.filter.FilterConfig;
import org.apache.pluto.descriptors.common.InitParamDD;
+import org.apache.pluto.om.common.InitParam;
/**
*
@@ -33,9 +34,9 @@
public class FilterConfigImpl implements FilterConfig {
private String filterName = null;
- private List<InitParamDD> initParameters = null;
+ private List<InitParam> initParameters = null;
private PortletContext portletContext = null;
- public FilterConfigImpl(String filterName, List<InitParamDD> initParameters, PortletContext portletContext){
+ public FilterConfigImpl(String filterName, List<InitParam> initParameters, PortletContext portletContext){
this.filterName = filterName;
this.initParameters = initParameters;
this.portletContext = portletContext;
@@ -45,7 +46,7 @@
}
public String getInitParameter(String name) {
- for (InitParamDD initParameter2 : initParameters) {
+ for (InitParam initParameter2 : initParameters) {
if (initParameter2.getParamName().equals(name)){
return initParameter2.getParamValue();
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/FilterManagerImpl.java Fri Apr 11 02:37:29 2008
@@ -27,9 +27,9 @@
import javax.portlet.PortletResponse;
import javax.portlet.ResourceServingPortlet;
-import org.apache.pluto.descriptors.portlet.FilterDD;
-import org.apache.pluto.descriptors.portlet.FilterMappingDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.om.portlet.Filter;
+import org.apache.pluto.om.portlet.FilterMapping;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.FilterManager;
/**
@@ -40,36 +40,36 @@
*/
public class FilterManagerImpl implements FilterManager{
private FilterChainImpl filterchain;
- private PortletAppDD portletAppDD;
+ private PortletApp portletApp;
private String portletName;
private String lifeCycle;
- public FilterManagerImpl(PortletAppDD portletAppDD, String portletName, String lifeCycle){
- this.portletAppDD = portletAppDD;
+ public FilterManagerImpl(PortletApp portletApp, String portletName, String lifeCycle){
+ this.portletApp = portletApp;
this.portletName = portletName;
this.lifeCycle = lifeCycle;
filterchain = new FilterChainImpl(lifeCycle);
initFilterChain();
}
- public static FilterManager getFilterManager(PortletAppDD portletAppDD, String portletName, String lifeCycle){
- return new FilterManagerImpl(portletAppDD,portletName,lifeCycle);
+ public static FilterManager getFilterManager(PortletApp portletApp, String portletName, String lifeCycle){
+ return new FilterManagerImpl(portletApp,portletName,lifeCycle);
}
private void initFilterChain(){
- List<FilterMappingDD> filterMappingList = portletAppDD.getFilterMapping();
+ List<FilterMapping> filterMappingList = portletApp.getFilterMapping();
if (filterMappingList!= null){
- for (FilterMappingDD filterMappingDD : filterMappingList) {
- if (isFilter(filterMappingDD, portletName)){
+ for (FilterMapping filterMapping : filterMappingList) {
+ if (isFilter(filterMapping, portletName)){
//the filter is specified for the portlet, check the filter for the lifecycle
- List<FilterDD> filterList = portletAppDD.getFilter();
- for (FilterDD filterDD : filterList) {
+ List<Filter> filterList = portletApp.getFilter();
+ for (Filter filter : filterList) {
//search for the filter in the filter
- if (filterDD.getFilterName().equals(filterMappingDD.getFilterName())){
+ if (filter.getFilterName().equals(filterMapping.getFilterName())){
//check the lifecycle
- if (isLifeCycle(filterDD, lifeCycle)){
+ if (isLifeCycle(filter, lifeCycle)){
//the filter match to the portlet and has the specified lifecycle -> add to chain
- filterchain.addFilter(filterDD);
+ filterchain.addFilter(filter);
}
}
}
@@ -90,8 +90,8 @@
filterchain.processFilter(req, res, loader, portlet, portletContext);
}
- private boolean isLifeCycle(FilterDD filterDD, String lifeCycle){
- List <String> lifeCyclesList = filterDD.getLifecycle();
+ private boolean isLifeCycle(Filter filter, String lifeCycle){
+ List <String> lifeCyclesList = filter.getLifecycle();
for (String string : lifeCyclesList) {
if (string.equals(lifeCycle))
return true;
@@ -99,8 +99,8 @@
return false;
}
- private boolean isFilter(FilterMappingDD filterMappingDD,String portletName){
- List <String> portletNamesList = filterMappingDD.getPortletName();
+ private boolean isFilter(FilterMapping filterMapping,String portletName){
+ List <String> portletNamesList = filterMapping.getPortletName();
for (String portletNameFromFilterList : portletNamesList) {
if (portletNameFromFilterList.endsWith("*")){
if (portletNameFromFilterList.length()==1){
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java Fri Apr 11 02:37:29 2008
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.driver.AttributeKeys;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.EventProvider;
import org.apache.pluto.spi.FilterManager;
import org.apache.pluto.spi.PortalCallbackService;
@@ -157,7 +157,7 @@
* Returns the FilterManager, this is used to process the filter.
* @return FilterManager
*/
- public FilterManager getFilterManager(PortletAppDD portletAppDD, String portletName, String lifeCycle) {
+ public FilterManager getFilterManager(PortletApp portletAppDD, String portletName, String lifeCycle) {
return FilterManagerImpl.getFilterManager(portletAppDD,portletName,lifeCycle);
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLListenerImpl.java Fri Apr 11 02:37:29 2008
@@ -26,9 +26,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.descriptors.portlet.ListenerDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.om.portlet.Listener;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.PortletURLListener;
public class PortletURLListenerImpl implements PortletURLListener {
@@ -41,16 +41,16 @@
}
- public synchronized void callListener(PortletAppDD portletAppDD, BaseURL baseURL, boolean isAction, boolean isResource){
+ public synchronized void callListener(PortletApp portletApp, BaseURL baseURL, boolean isAction, boolean isResource){
if (isAction&&isResource){
String message = "It is not allowed to set both values from isAction and isResource to true";
LOG.error(message, new IllegalArgumentException(message));
}
//this list is needed for the classnames
- List<ListenerDD> portletURLFilterList = portletAppDD.getListener();//internalPortletWindow.get getPortletEntity(). getPortletDefinition().getUrlGenerationListener();
+ List<Listener> portletURLFilterList = portletApp.getListener();//internalPortletWindow.get getPortletEntity(). getPortletDefinition().getUrlGenerationListener();
//Iterate over the classnames and for each entry in the list the filter..URL is called.
if (portletURLFilterList != null){
- for (ListenerDD listener : portletURLFilterList) {
+ for (Listener listener : portletURLFilterList) {
ClassLoader loader = Thread.currentThread().getContextClassLoader();
Class clazz;
try {
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletWindowThread.java Fri Apr 11 02:37:29 2008
@@ -42,13 +42,13 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.descriptors.portlet.EventDefinitionDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortalServletRequest;
import org.apache.pluto.internal.impl.ActionResponseImpl;
import org.apache.pluto.internal.impl.EventImpl;
+import org.apache.pluto.om.portlet.EventDefinition;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.optional.PortletRegistryService;
public class PortletWindowThread extends Thread {
@@ -117,7 +117,7 @@
//provider.getEventDefinition(event.getQName());
try {
// now test if object is jaxb
- EventDefinitionDD eventDefinitionDD = getEventDefintion(event.getQName());
+ EventDefinition eventDefinitionDD = getEventDefintion(event.getQName());
ClassLoader loader = portletRegistry.getClassLoader(portletWindow.getPortletName());//Thread.currentThread().getContextClassLoader();
Class<? extends Serializable> clazz = loader.loadClass(eventDefinitionDD.getJavaClass()).asSubclass(Serializable.class);
@@ -156,12 +156,12 @@
this.events.add(event);
}
- private EventDefinitionDD getEventDefintion(QName name) throws PortletContainerException {
+ private EventDefinition getEventDefintion(QName name) throws PortletContainerException {
PortalRequestContext context = PortalRequestContext.getContext(eventProvider.getRequest());
ServletContext servletContext = context.getServletContext();
PortletContainer container = (PortletContainer) servletContext.getAttribute(AttributeKeys.PORTLET_CONTAINER);
- PortletAppDD appDD = container.getPortletApplicationDescriptor(portletWindow.getContextPath());
- for (EventDefinitionDD def : appDD.getEvents()){
+ PortletApp appDD = container.getPortletApplicationDescriptor(portletWindow.getContextPath());
+ for (EventDefinition def : appDD.getEvents()){
if (def.getQName() != null){
if (def.getQName().equals(name))
return def;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedModesServiceImpl.java Fri Apr 11 02:37:29 2008
@@ -29,9 +29,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.portlet.SupportsDD;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.container.FilterManagerImpl;
@@ -39,6 +36,9 @@
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
import org.apache.pluto.driver.services.portal.SupportedModesService;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.portlet.Supports;
import org.apache.pluto.spi.optional.PortletRegistryService;
/**
@@ -113,14 +113,14 @@
LOG.error("Optional Portlet Registry Service not found.");
throw new PortletContainerException("Optional Portlet Registry Service not found.");
}
- PortletAppDD ctx = portletRegistry.getPortletApplicationDescriptor(applicationId);
+ PortletApp ctx = portletRegistry.getPortletApplicationDescriptor(applicationId);
Iterator i = ctx.getPortlets().iterator();
while(i.hasNext()) {
- PortletDD dd = (PortletDD)i.next();
+ Portlet dd = (Portlet)i.next();
if(portletName.equals(dd.getPortletName())) {
Iterator i2 = dd.getSupports().iterator();
while(i2.hasNext()) {
- SupportsDD sd = (SupportsDD)i2.next();
+ Supports sd = (Supports)i2.next();
if (sd.getPortletModes()==null){
if (mode.equalsIgnoreCase(PortletMode.VIEW.toString()))
return true;
@@ -192,7 +192,7 @@
while (apps.hasNext())
{
PortletApplicationConfig app = (PortletApplicationConfig)apps.next();
- PortletAppDD portletAppDD;
+ PortletApp portletAppDD;
try {
PortletContainer container = (PortletContainer)servletContext
.getAttribute(AttributeKeys.PORTLET_CONTAINER);
@@ -204,14 +204,14 @@
}
Iterator portlets = portletAppDD.getPortlets().iterator();
while (portlets.hasNext()) {
- PortletDD portlet = (PortletDD)portlets.next();
+ Portlet portlet = (Portlet)portlets.next();
LOG.debug("Loading modes supported by portlet [" + app.getContextPath() + "]." +
"[" + portlet.getPortletName() + "]");
Iterator supports = portlet.getSupports().iterator();
Set pModes = new HashSet();
while (supports.hasNext())
{
- SupportsDD supportsDD = (SupportsDD)supports.next();
+ Supports supportsDD = (Supports)supports.next();
if (supportsDD.getPortletModes()!=null){
Iterator portletModes = supportsDD.getPortletModes().iterator();
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/SupportedWindowStateServiceImpl.java Fri Apr 11 02:37:29 2008
@@ -28,14 +28,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.CustomWindowStateDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.driver.AttributeKeys;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.config.DriverConfigurationException;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PropertyConfigService;
import org.apache.pluto.driver.services.portal.SupportedWindowStateService;
+import org.apache.pluto.om.portlet.CustomWindowState;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.spi.optional.PortletRegistryService;
public class SupportedWindowStateServiceImpl implements
@@ -143,7 +143,7 @@
// we look to see if it is a custom window state.
String appId = PortletWindowConfig.parseContextPath(portletId);
- PortletAppDD portletAppDD = null;
+ PortletApp portletAppDD = null;
if (portletRegistry == null)
{
@@ -171,7 +171,7 @@
{
for ( Iterator i = customWindowStates.iterator(); i.hasNext(); )
{
- CustomWindowStateDD customState = (CustomWindowStateDD)i.next();
+ CustomWindowState customState = (CustomWindowState)i.next();
if ( customState.getWindowState().equals(state))
{
return true;
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Fri Apr 11 02:37:29 2008
@@ -31,13 +31,13 @@
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.driver.core.PortalRequestContext;
import org.apache.pluto.driver.core.PortletWindowImpl;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.url.PortalURL;
+import org.apache.pluto.om.portlet.Portlet;
/**
* The controller servlet used to drive the Portal Driver. All requests mapped
@@ -194,7 +194,7 @@
private void setPublicRenderParameter(HttpServletRequest request, PortalURL portalURL, String portletID)throws ServletException, PortletContainerException {
String applicationId = PortletWindowConfig.parseContextPath(portletID);
String portletName = PortletWindowConfig.parsePortletName(portletID);
- PortletDD portletDD = container.getOptionalContainerServices().getPortletRegistryService()
+ Portlet portletDD = container.getOptionalContainerServices().getPortletRegistryService()
.getPortletDescriptor(applicationId, portletName);
Enumeration<String> parameterNames = request.getParameterNames();
if (parameterNames != null){
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssemblerAnt.java Fri Apr 11 02:37:29 2008
@@ -15,11 +15,11 @@
*/
package org.apache.pluto.util.assemble.file;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
import org.apache.pluto.util.UtilityException;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.EntityResolverImpl;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
@@ -157,13 +157,13 @@
PortletAppDescriptorService portletAppDescriptorService =
new PortletAppDescriptorServiceImpl();
- PortletAppDD portletAppDD = portletAppDescriptorService.read(portletXmlIn);
+ PortletApp portletAppDD = portletAppDescriptorService.read(portletXmlIn);
for (Iterator it = portletAppDD.getPortlets().iterator();
it.hasNext(); ) {
// Read portlet definition.
- PortletDD portlet = (PortletDD) it.next();
+ Portlet portlet = (Portlet) it.next();
String name = portlet.getPortletName();
// Create servlet definition element.
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/main/java/org/apache/pluto/util/assemble/io/WebXmlStreamingAssembly.java Fri Apr 11 02:37:29 2008
@@ -22,8 +22,6 @@
import java.util.Iterator;
import org.apache.pluto.descriptors.common.InitParamDD;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.WebAppDescriptorServiceImpl;
@@ -31,7 +29,13 @@
import org.apache.pluto.descriptors.servlet.LoadOnStartupDD;
import org.apache.pluto.descriptors.servlet.ServletDD;
import org.apache.pluto.descriptors.servlet.ServletMappingDD;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
+import org.apache.pluto.om.common.InitParam;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.servlet.LoadOnStartup;
+import org.apache.pluto.om.servlet.Servlet;
+import org.apache.pluto.om.servlet.ServletMapping;
+import org.apache.pluto.om.servlet.WebApp;
import org.apache.pluto.util.assemble.Assembler;
/**
@@ -63,32 +67,32 @@
WebAppDescriptorService descriptorSvc = new WebAppDescriptorServiceImpl();
PortletAppDescriptorService portletAppDescriptorSvc = new PortletAppDescriptorServiceImpl();
- WebAppDD webAppDDIn = descriptorSvc.read(webXmlIn);
- PortletAppDD portletAppDD = portletAppDescriptorSvc.read(portletXmlIn);
+ WebApp webAppDDIn = descriptorSvc.read(webXmlIn);
+ PortletApp portletAppDD = portletAppDescriptorSvc.read(portletXmlIn);
portletXmlIn.close();
for (Iterator it = portletAppDD.getPortlets().iterator();
it.hasNext(); ) {
// Read portlet definition.
- PortletDD portlet = (PortletDD) it.next();
+ Portlet portlet = (Portlet) it.next();
String name = portlet.getPortletName();
- ServletDD servlet = new ServletDD();
+ Servlet servlet = new ServletDD();
servlet.setServletName(name);
servlet.setServletClass(dispatchServletClass);
- InitParamDD initParam = new InitParamDD();
+ InitParam initParam = new InitParamDD();
initParam.setParamName("portlet-name");
initParam.setParamValue(name);
servlet.getInitParams().add(initParam);
- LoadOnStartupDD onStartup = new LoadOnStartupDD();
+ LoadOnStartup onStartup = new LoadOnStartupDD();
onStartup.setPriority(1);
servlet.setLoadOnStartup(onStartup);
- ServletMappingDD servletMapping = new ServletMappingDD();
+ ServletMapping servletMapping = new ServletMappingDD();
servletMapping.setServletName(name);
servletMapping.setUrlPattern("/PlutoInvoker/" + name);
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/ComplexEarAssemblerTest.java Fri Apr 11 02:37:29 2008
@@ -26,14 +26,14 @@
import java.util.jar.JarInputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.WebAppDescriptorServiceImpl;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.servlet.ServletDD;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.servlet.Servlet;
+import org.apache.pluto.om.servlet.WebApp;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
@@ -98,8 +98,8 @@
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
WebAppDescriptorService webSvc = new WebAppDescriptorServiceImpl();
- PortletAppDD portletAppDD = null;
- WebAppDD webAppDD = null;
+ PortletApp portletApp = null;
+ WebApp webAppDD = null;
List portletWarEntries = Arrays.asList( testWarEntryNames );
List unassembledWarEntries = Arrays.asList( unassembledWarEntryName );
@@ -124,7 +124,7 @@
while ( ( warEntry = warIn.getNextJarEntry() ) != null ) {
if ( Assembler.PORTLET_XML.equals( warEntry.getName() ) ) {
- portletAppDD = portletSvc.read(
+ portletApp = portletSvc.read(
new ByteArrayInputStream( IOUtils.toByteArray( warIn ) ) );
}
if ( Assembler.SERVLET_XML.equals( warEntry.getName() ) ) {
@@ -135,18 +135,18 @@
if ( portletWarEntries.contains( earEntry.getName() ) ) {
portletWarEntryCount++;
- assertNotNull( "WAR archive did not contain a portlet.xml", portletAppDD );
+ assertNotNull( "WAR archive did not contain a portlet.xml", portletApp );
assertNotNull( "WAR archive did not contain a servlet.xml", webAppDD );
assertTrue( "WAR archive did not contain any servlets", webAppDD.getServlets().size() > 0 );
assertTrue( "WAR archive did not contain any servlet mappings", webAppDD.getServletMappings().size() > 0 );
- assertTrue( "WAR archive did not contain any portlets", portletAppDD.getPortlets().size() > 0 );
+ assertTrue( "WAR archive did not contain any portlets", portletApp.getPortlets().size() > 0 );
- for ( Iterator iter = portletAppDD.getPortlets().iterator(); iter.hasNext(); ) {
- PortletDD portlet = (PortletDD) iter.next();
+ for ( Iterator iter = portletApp.getPortlets().iterator(); iter.hasNext(); ) {
+ Portlet portlet = (Portlet) iter.next();
if (! testPortlets.contains( portlet.getPortletName() ) ) {
fail( "Unexpected test portlet name encountered: [" + portlet.getPortletName() + "]" );
}
- ServletDD servlet = webAppDD.getServlet( portlet.getPortletName() );
+ Servlet servlet = webAppDD.getServlet( portlet.getPortletName() );
assertNotNull( "web.xml does not contain assembly for test portlet", servlet );
assertEquals( "web.xml does not contain correct dispatch servet", Assembler.DISPATCH_SERVLET_CLASS,
servlet.getServletClass() );
@@ -155,7 +155,7 @@
}
webAppDD = null;
- portletAppDD = null;
+ portletApp = null;
}
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/ear/EarAssemblerTest.java Fri Apr 11 02:37:29 2008
@@ -24,14 +24,14 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.WebAppDescriptorServiceImpl;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.servlet.ServletDD;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.servlet.Servlet;
+import org.apache.pluto.om.servlet.WebApp;
import org.apache.pluto.util.assemble.ArchiveBasedAssemblyTest;
import org.apache.pluto.util.assemble.Assembler;
import org.apache.pluto.util.assemble.AssemblerConfig;
@@ -89,8 +89,8 @@
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
WebAppDescriptorService webSvc = new WebAppDescriptorServiceImpl();
- PortletAppDD portletAppDD = null;
- WebAppDD webAppDD = null;
+ PortletApp portletApp = null;
+ WebApp webAppDD = null;
int earEntryCount = 0;
int warEntryCount = 0;
@@ -107,7 +107,7 @@
JarInputStream warIn = new JarInputStream( earIn );
while ( ( warEntry = warIn.getNextJarEntry() ) != null ) {
if ( Assembler.PORTLET_XML.equals( warEntry.getName() ) ) {
- portletAppDD = portletSvc.read(
+ portletApp = portletSvc.read(
new ByteArrayInputStream( IOUtils.toByteArray( warIn ) ) );
}
if ( Assembler.SERVLET_XML.equals( warEntry.getName() ) ) {
@@ -120,16 +120,16 @@
assertTrue( "EAR archive did not contain any entries", earEntryCount > 0 );
assertTrue( "WAR archive did not contain any entries", warEntryCount > 0 );
- assertNotNull( "WAR archive did not contain a portlet.xml", portletAppDD );
+ assertNotNull( "WAR archive did not contain a portlet.xml", portletApp );
assertNotNull( "WAR archive did not contain a servlet.xml", webAppDD );
assertTrue( "WAR archive did not contain any servlets", webAppDD.getServlets().size() > 0 );
assertTrue( "WAR archive did not contain any servlet mappings", webAppDD.getServletMappings().size() > 0 );
- assertTrue( "WAR archive did not contain any portlets", portletAppDD.getPortlets().size() > 0 );
+ assertTrue( "WAR archive did not contain any portlets", portletApp.getPortlets().size() > 0 );
- PortletDD portlet = (PortletDD) portletAppDD.getPortlets().iterator().next();
+ Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
assertEquals( "Unexpected test portlet name.", testPortletName, portlet.getPortletName() );
- ServletDD servlet = webAppDD.getServlet( testPortletName );
+ Servlet servlet = webAppDD.getServlet( testPortletName );
assertNotNull( "web.xml does not contain assembly for test portlet", servlet );
assertEquals( "web.xml does not contain correct dispatch servet", Assembler.DISPATCH_SERVLET_CLASS,
servlet.getServletClass() );
Modified: portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java?rev=647088&r1=647087&r2=647088&view=diff
==============================================================================
--- portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java (original)
+++ portals/pluto/branches/2.0-spi-refactoring/pluto-util/src/test/java/org/apache/pluto/util/assemble/io/AssemblyStreamTest.java Fri Apr 11 02:37:29 2008
@@ -31,13 +31,14 @@
import org.apache.commons.io.IOUtils;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
import org.apache.pluto.descriptors.services.WebAppDescriptorService;
import org.apache.pluto.descriptors.services.castor.WebAppDescriptorServiceImpl;
import org.apache.pluto.descriptors.services.jaxb.PortletAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.servlet.ServletDD;
-import org.apache.pluto.descriptors.servlet.WebAppDD;
+import org.apache.pluto.om.portlet.Portlet;
+import org.apache.pluto.om.portlet.PortletApp;
+import org.apache.pluto.om.servlet.Servlet;
+import org.apache.pluto.om.servlet.WebApp;
import org.apache.pluto.util.assemble.Assembler;
/**
@@ -88,8 +89,8 @@
protected void verifyAssembly( InputStream webXml, InputStream portletXml ) throws Exception {
WebAppDescriptorService webSvc = new WebAppDescriptorServiceImpl();
PortletAppDescriptorService portletSvc = new PortletAppDescriptorServiceImpl();
- WebAppDD webApp = webSvc.read( webXml ) ;
- PortletAppDD portletApp = portletSvc.read( portletXml );
+ WebApp webApp = webSvc.read( webXml ) ;
+ PortletApp portletApp = portletSvc.read( portletXml );
assertNotNull( "Web Application Descripter was null.", webApp );
assertNotNull( "Portlet Application Descriptor was null.", portletApp );
@@ -97,10 +98,10 @@
assertTrue( "Web Application Descriptor doesn't define any servlets.", webApp.getServlets().size() > 0 );
assertTrue( "Web Application Descriptor doesn't define any servlet mappings.", webApp.getServletMappings().size() > 0 );
- PortletDD portlet = (PortletDD) portletApp.getPortlets().iterator().next();
+ Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
assertTrue( "Unable to retrieve test portlet named [" + testPortletName + "]", portlet.getPortletName().equals( testPortletName ) );
- ServletDD servlet = webApp.getServlet( testPortletName );
+ Servlet servlet = webApp.getServlet( testPortletName );
assertNotNull( "Unable to retrieve portlet dispatch for portlet named [" + testPortletName + "]", servlet );
assertEquals( "Dispatcher servlet incorrect for test portlet [" + testPortletName + "]", Assembler.DISPATCH_SERVLET_CLASS, servlet.getServletClass() );
}
@@ -111,8 +112,8 @@
int entryCount = 0;
ByteArrayOutputStream portletXmlBytes = new ByteArrayOutputStream();
ByteArrayOutputStream webXmlBytes = new ByteArrayOutputStream();
- WebAppDD webApp = null;
- PortletAppDD portletApp = null;
+ WebApp webApp = null;
+ PortletApp portletApp = null;
JarInputStream assembledWarIn = new JarInputStream( new FileInputStream( warFile ) );
JarEntry tempEntry;
@@ -137,10 +138,10 @@
assertTrue( "Web Application Descriptor doesn't define any servlets.", webApp.getServlets().size() > 0 );
assertTrue( "Web Application Descriptor doesn't define any servlet mappings.", webApp.getServletMappings().size() > 0 );
- PortletDD portlet = (PortletDD) portletApp.getPortlets().iterator().next();
+ Portlet portlet = (Portlet) portletApp.getPortlets().iterator().next();
assertTrue( "Unable to retrieve test portlet named [" + testPortletName + "]", portlet.getPortletName().equals( testPortletName ) );
- ServletDD servlet = webApp.getServlet( testPortletName );
+ Servlet servlet = webApp.getServlet( testPortletName );
assertNotNull( "Unable to retrieve portlet dispatch for portlet named [" + testPortletName + "]", servlet );
assertEquals( "Dispatcher servlet incorrect for test portlet [" + testPortletName + "]", Assembler.DISPATCH_SERVLET_CLASS, servlet.getServletClass() );
}