Author: julien(a)jboss.com
Date: 2007-03-25 16:43:24 -0400 (Sun, 25 Mar 2007)
New Revision: 6822
Added:
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java
Removed:
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProvider.java
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProviderRegistry.java
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentState.java
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java
trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
Log:
moved interfaces at better places :
- ContentState -> handler package
- ContentProvider & ContentProviderRegistry to spi
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -33,7 +33,7 @@
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.server.deployment.PortalWebApp;
import org.jboss.portal.server.deployment.jboss.Deployment;
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -25,7 +25,7 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.portal.common.transaction.TransactionManagerProvider;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.server.deployment.PortalWebApp;
import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
import org.jboss.portal.server.deployment.jboss.Deployment;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/AbstractContent.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -23,7 +23,7 @@
package org.jboss.portal.core.impl.model.content;
import org.jboss.portal.core.model.content.Content;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import java.util.Iterator;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/ContentProviderRegistryService.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -23,7 +23,7 @@
package org.jboss.portal.core.impl.model.content;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.portal.content.ContentRenderer;
import org.jboss.portal.common.util.CopyOnWriteRegistry;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -24,7 +24,7 @@
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.Content;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.portal.command.RenderWindowCommand;
import org.jboss.portal.core.model.portal.command.InvokePortletWindowRenderCommand;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProviderRegistry.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -23,7 +23,7 @@
package org.jboss.portal.core.impl.model.content;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.core.model.portal.content.ContentRendererRegistry;
/**
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContent.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.core.impl.model.content.generic;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.impl.model.content.AbstractContent;
import org.jboss.portal.common.i18n.LocalizedString;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -23,9 +23,9 @@
package org.jboss.portal.core.impl.model.content.generic;
import org.jboss.portal.core.model.content.Content;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.model.instance.Instance;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -25,9 +25,9 @@
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.content.Content;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.model.portal.command.RenderWindowCommand;
@@ -40,7 +40,6 @@
import org.jboss.portal.common.i18n.LocalizedString;
import java.util.ResourceBundle;
-import java.util.Locale;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/content/portlet/PortletContent.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.core.impl.model.content.portlet;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.impl.model.content.AbstractContent;
import org.jboss.portal.common.i18n.LocalizedString;
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -27,8 +27,8 @@
import org.jboss.portal.core.model.portal.PortalObjectPermission;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.jems.as.system.AbstractJBossService;
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-03-25
13:20:26 UTC (rev 6821)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -26,7 +26,7 @@
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.content.Content;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.jems.hibernate.ContextObject;
Deleted: trunk/core/src/main/org/jboss/portal/core/model/content/ContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProvider.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -1,70 +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.core.model.content;
-
-import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
-import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
-import org.jboss.portal.common.i18n.LocalizedString;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public interface ContentProvider
-{
-
- /**
- * Return the content type value.
- *
- * @return the content type
- */
- ContentType getContentType();
-
- /**
- * Returns the display name.
- *
- * @return the display name
- */
- LocalizedString getDisplayName();
-
- /**
- * Returns the description.
- *
- * @return the description
- */
- LocalizedString getDescription();
-
- /**
- * Returns the handler.
- *
- * @return the handler
- */
- ContentHandler getHandler();
-
- /**
- * Returns the portlet info
- *
- * @return the portlet info
- */
- ContentPortlet getPortletInfo();
-}
Deleted:
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProviderRegistry.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProviderRegistry.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProviderRegistry.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -1,42 +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.core.model.content;
-
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public interface ContentProviderRegistry
-{
- /**
- *
- */
- Collection getContentTypes();
-
- /**
- *
- */
- ContentProvider getContentProvider(ContentType contentType);
-}
Copied: trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java
(from rev 6818,
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProvider.java)
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java
(rev 0)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -0,0 +1,71 @@
+/******************************************************************************
+ * 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.core.model.content.spi;
+
+import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
+import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
+import org.jboss.portal.core.model.content.ContentType;
+import org.jboss.portal.common.i18n.LocalizedString;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ContentProvider
+{
+
+ /**
+ * Return the content type value.
+ *
+ * @return the content type
+ */
+ ContentType getContentType();
+
+ /**
+ * Returns the display name.
+ *
+ * @return the display name
+ */
+ LocalizedString getDisplayName();
+
+ /**
+ * Returns the description.
+ *
+ * @return the description
+ */
+ LocalizedString getDescription();
+
+ /**
+ * Returns the handler.
+ *
+ * @return the handler
+ */
+ ContentHandler getHandler();
+
+ /**
+ * Returns the portlet info
+ *
+ * @return the portlet info
+ */
+ ContentPortlet getPortletInfo();
+}
Copied:
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java
(from rev 6816,
trunk/core/src/main/org/jboss/portal/core/model/content/ContentProviderRegistry.java)
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java
(rev 0)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentProviderRegistry.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.model.content.spi;
+
+import org.jboss.portal.core.model.content.ContentType;
+
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ContentProviderRegistry
+{
+ /**
+ *
+ */
+ Collection getContentTypes();
+
+ /**
+ *
+ */
+ ContentProvider getContentProvider(ContentType contentType);
+}
Deleted: trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentState.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentState.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentState.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -1,56 +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.core.model.content.spi;
-
-import java.util.Iterator;
-
-/**
- * Represents the state of the content which consist in an URI and a set of properties.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public interface ContentState
-{
- /**
- * Returns the URI value.
- *
- * @return the URI
- */
- String getURI();
-
- /**
- * Set the URI value.
- *
- * @param uri the URI
- */
- void setURI(String uri);
-
- Iterator getParameterNames();
-
- void setParameter(String name, String value) throws IllegalArgumentException;
-
- String getParameter(String name) throws IllegalArgumentException;
-
- void clearParameters();
-}
Modified:
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentHandler.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -23,7 +23,7 @@
package org.jboss.portal.core.model.content.spi.handler;
import org.jboss.portal.core.model.content.Content;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
/**
* The content handler act as a factory for <code>Content</code> objects from
their state. The interface
Copied:
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java
(from rev 6816,
trunk/core/src/main/org/jboss/portal/core/model/content/spi/ContentState.java)
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java
(rev 0)
+++
trunk/core/src/main/org/jboss/portal/core/model/content/spi/handler/ContentState.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * 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.core.model.content.spi.handler;
+
+import java.util.Iterator;
+
+/**
+ * Represents the state of the content which consist in an URI and a set of properties.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ContentState
+{
+ /**
+ * Returns the URI value.
+ *
+ * @return the URI
+ */
+ String getURI();
+
+ /**
+ * Set the URI value.
+ *
+ * @param uri the URI
+ */
+ void setURI(String uri);
+
+ Iterator getParameterNames();
+
+ void setParameter(String name, String value) throws IllegalArgumentException;
+
+ String getParameter(String name) throws IllegalArgumentException;
+
+ void clearParameters();
+}
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/ContextMetaData.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -24,7 +24,7 @@
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalContainer;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.common.util.XML;
import org.w3c.dom.Element;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PageMetaData.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -25,7 +25,7 @@
import org.jboss.portal.common.util.XML;
import org.jboss.portal.core.model.portal.PageContainer;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.w3c.dom.Element;
import java.util.List;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalMetaData.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -28,7 +28,7 @@
import org.jboss.portal.core.model.portal.PortalContainer;
import org.jboss.portal.core.model.portal.Portal;
import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.portlet.impl.jsr168.metadata.ModesMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.WindowStatesMetaData;
import org.w3c.dom.Element;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -25,7 +25,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.util.XML;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.PortalObjectContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/metadata/WindowMetaData.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -26,7 +26,7 @@
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
import org.jboss.portal.theme.ThemeConstants;
import org.jboss.portal.common.util.XML;
import org.w3c.dom.Element;
Modified: trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContent.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.core.model.content;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.impl.model.content.AbstractContent;
import org.jboss.portal.common.i18n.LocalizedString;
Modified:
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentHandler.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.core.model.content;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.core.model.content.Content;
Modified:
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/test/core/model/content/NullContentProvider.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.core.model.content;
-import org.jboss.portal.core.model.content.ContentProvider;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.handler.ContentHandler;
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
Modified:
trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-03-25
13:20:26 UTC (rev 6821)
+++
trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-03-25
20:43:24 UTC (rev 6822)
@@ -31,9 +31,9 @@
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.model.content.ContentProviderRegistry;
-import org.jboss.portal.core.model.content.ContentProvider;
-import org.jboss.portal.core.model.content.spi.ContentState;
+import org.jboss.portal.core.model.content.spi.ContentProviderRegistry;
+import org.jboss.portal.core.model.content.spi.ContentProvider;
+import org.jboss.portal.core.model.content.spi.handler.ContentState;
import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl;
import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory;
import org.jboss.portal.test.core.PortalBaseTestCase;