JBoss Portal SVN: r6525 - in trunk/wsrp/src: main/org/jboss/portal/wsrp/consumer and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-03 21:21:15 -0500 (Sat, 03 Mar 2007)
New Revision: 6525
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
Log:
- Added ConsumerRegistry.updateProducerInfo method.
- Give access to ConsumerRegistry to ProducerInfo so that we can update it when needed.
- Moved UNSET value from ServiceFactory to EnpointConfigurationInfo to allow for better creation and persisting.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -29,6 +29,7 @@
import org.jboss.portal.wsrp.WSRPConsumer;
import org.jboss.portal.wsrp.consumer.ConsumerException;
import org.jboss.portal.wsrp.consumer.ConsumerRegistry;
+import org.jboss.portal.wsrp.consumer.ProducerInfo;
import java.util.Collection;
import java.util.HashMap;
@@ -82,4 +83,9 @@
{
// do nothing
}
+
+ public void updateProducerInfo(ProducerInfo producerInfo)
+ {
+ // do nothing
+ }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -45,4 +45,6 @@
void persistConsumer(WSRPConsumer consumer);
void activateConsumerWith(String id) throws ConsumerException;
+
+ void updateProducerInfo(ProducerInfo producerInfo);
}
\ No newline at end of file
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -23,6 +23,7 @@
package org.jboss.portal.wsrp.consumer;
+import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.jboss.portal.common.util.ParameterValidation;
@@ -50,8 +51,6 @@
private SortedMap consumers;
-// private Set startedConsumerIds = new HashSet();
-
private SessionFactory sessionFactory;
private String sessionFactoryJNDIName;
@@ -70,12 +69,20 @@
throw new ConsumerException("A Consumer with id '" + id + "' already exists!");
}
- Session session = sessionFactory.getCurrentSession();
ProducerInfo info = new ProducerInfo();
info.setId(id);
+ info.setRegistry(this);
- session.persist(info);
+ try
+ {
+ Session session = sessionFactory.getCurrentSession();
+ session.persist(info);
+ }
+ catch (HibernateException e)
+ {
+ throw new ConsumerException("Couldn't create Consumer '" + id + "'", e);
+ }
return createConsumerFrom(info);
}
@@ -126,8 +133,7 @@
private WSRPConsumer createConsumerFrom(ProducerInfo producerInfo)
{
- WSRPConsumer consumer = new WSRPConsumerImpl();
- consumer.setProducerInfo(producerInfo);
+ WSRPConsumer consumer = new WSRPConsumerImpl(producerInfo, this);
consumers.put(producerInfo.getId(), consumer);
return consumer;
@@ -165,14 +171,25 @@
info.setActive(true);
// update ProducerInfo
- Session session = sessionFactory.getCurrentSession();
- session.beginTransaction();
+ updateProducerInfo(info);
+ }
- session.update(info);
+ }
- session.getTransaction().commit();
- }
+ public void updateProducerInfo(ProducerInfo producerInfo)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo");
+ try
+ {
+ Session session = sessionFactory.getCurrentSession();
+
+ session.update(producerInfo);
+ }
+ catch (HibernateException e)
+ {
+ throw new ConsumerException("Couldn't update ProducerInfo for Consumer '" + producerInfo.getId() + "'", e);
+ }
}
protected void stopService() throws Exception
@@ -191,42 +208,5 @@
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null);
return (WSRPConsumer)consumers.get(id);
-
- /*// first check if this consumer has already been loaded
- WSRPConsumer wsrpConsumer = (WSRPConsumer)consumers.get(id);
-
- if(wsrpConsumer != null)
- {
- return wsrpConsumer;
- }
- else
- {
- Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("from ProducerInfo where id=:id");
- query.setString("id", id);
- ProducerInfo pi = (ProducerInfo)query.uniqueResult();
- if (pi != null)
- {
- wsrpConsumer = new WSRPConsumerImpl();
- wsrpConsumer.setProducerInfo(pi);
- consumers.put(pi.getId(), wsrpConsumer);
- if (pi.isActive())
- {
- WSRPConsumerService service = new WSRPConsumerService();
- service.setConsumer(wsrpConsumer);
- service.setFederatingPortletInvoker(federatingPortletInvoker);
- try
- {
- service.start();
- }
- catch (Exception e)
- {
- throw new RuntimeException("Couldn't start Consumer '" + pi.getId() + "'", e);
- }
- }
- return wsrpConsumer;
- }
- return null;
- }*/
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -43,8 +43,8 @@
/** DB primary key */
private Long key;
- private String serviceDescriptionURL;
- private String markupURL;
+ private String serviceDescriptionURL = UNSET;
+ private String markupURL = UNSET;
private String registrationURL;
private String portletManagementURL;
private String wsdlDefinitionURL;
@@ -58,7 +58,10 @@
static final String PORTLET_MANAGEMENT = "portlet management";
static final String REGISTRATION = "registration";
+ // Used to ensure that even invalid values can be persisted to DB so that it can be accessed from the GUI
+ public final static String UNSET = "MUST BE SET";
+
public EndpointConfigurationInfo()
{
}
@@ -199,7 +202,7 @@
}
else
{
- if (serviceDescriptionURL != null && markupURL != null)
+ if (!UNSET.equals(serviceDescriptionURL) && !UNSET.equals(markupURL))
{
serviceFactory = new PerEndpointSOAPInvokerServiceFactory();
serviceFactory.setServiceDescriptionURL(serviceDescriptionURL);
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -102,6 +102,8 @@
/** The service description sent to producer. */
private GetServiceDescription serviceDescriptionRequest;
+ private ConsumerRegistry registry;
+
/*protected org.jboss.portal.wsrp.core.ItemDescription[] userCategoryDescriptions;
protected org.jboss.portal.wsrp.core.ItemDescription[] customUserProfileItemDescriptions;
protected org.jboss.portal.wsrp.core.ItemDescription[] customWindowStateDescriptions;
@@ -119,7 +121,16 @@
persistentRegistrationInfo = RegistrationInfo.REGISTRATION_NOT_NEEDED;
}
+ public ConsumerRegistry getRegistry()
+ {
+ return registry;
+ }
+ public void setRegistry(ConsumerRegistry registry)
+ {
+ this.registry = registry;
+ }
+
public Long getKey()
{
return key;
@@ -184,11 +195,25 @@
*
* @param forceRefresh whether or not to force a refresh regardless of whether one would have been required based on
* cache expiration
- * @return <code>true</code> if the producer's information just was refreshed, <code>false</code>
+ * @return <code>true</code> if the producer's information was just refreshed, <code>false</code> otherwise
* @throws PortletInvokerException if registration was required but couldn't be achieved properly
*/
public boolean refresh(boolean forceRefresh) throws PortletInvokerException
{
+ boolean justRefreshed = internalRefresh(forceRefresh);
+
+ // update DB
+ if (justRefreshed)
+ {
+ registry.updateProducerInfo(this);
+ }
+
+ return justRefreshed;
+ }
+
+ private boolean internalRefresh(boolean forceRefresh)
+ throws PortletInvokerException
+ {
ServiceDescription serviceDescription;
// might neeed a different cache value: right now, we cache the whole producer info but we might want to cache
// POPs and rest of producer info separetely...
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -117,9 +117,12 @@
/** The set of supported user scopes */
private Set supportedUserScopes = WSRP_DEFAULT_USER_SCOPE; // todo: make it possible to support different user scopes
- public WSRPConsumerImpl()
+ WSRPConsumerImpl(ProducerInfo info, ConsumerRegistry registry)
{
- producerInfo = new ProducerInfo();
+ ParameterValidation.throwIllegalArgExceptionIfNull(info, "ProducerInfo");
+ ParameterValidation.throwIllegalArgExceptionIfNull(registry, "ConsumerRegistry");
+
+ producerInfo = info;
actionHandler = new ActionHandler(this);
renderHandler = new RenderHandler(this);
sessionHandler = new SessionHandler(this);
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -29,7 +29,6 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
-import org.jboss.portal.wsrp.consumer.WSRPConsumerImpl;
import org.jboss.util.StringPropertyReplacer;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
@@ -109,9 +108,8 @@
}
// consumer didn't exist in the database, so create one and configure it
- consumer = new WSRPConsumerImpl();
+ consumer = consumerRegistry.createConsumer(id);
ProducerInfo info = consumer.getProducerInfo();
- info.setId(id);
String expirationCache = attrs.getValue("expiration-cache");
if (expirationCache != null)
@@ -147,7 +145,6 @@
ProducerInfo prodInfo = service.getConsumer().getProducerInfo();
- RegistrationInfo regInfo = null;
if ("endpoint-config".equals(localName) || "endpoint-wsdl-url".equals(localName))
{
return new EndpointConfigurationInfo(prodInfo);
@@ -287,8 +284,8 @@
+ service.getId() + "'. The consumer will NOT be available.";
}
- // persist the consumer once the whole information is known
- consumerRegistry.persistConsumer(service.getConsumer());
+ // update the producer info once the whole information is known
+ consumerRegistry.updateProducerInfo(service.getConsumer().getProducerInfo());
log.info(message);
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java 2007-03-04 02:21:15 UTC (rev 6525)
@@ -23,6 +23,7 @@
package org.jboss.portal.wsrp.services;
import org.jboss.portal.common.util.ParameterValidation;
+import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType;
import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType;
import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
@@ -40,14 +41,11 @@
public class PerEndpointSOAPInvokerServiceFactory extends AbstractSOAPServiceFactory
{
- // Used to ensure that even invalid values can be persisted to DB so that it can be accessed from the GUI
- public final static String UNSET = "MUST BE SET";
-
/** . */
- protected String serviceDescriptionURL = UNSET;
+ protected String serviceDescriptionURL = EndpointConfigurationInfo.UNSET;
/** . */
- protected String markupURL = UNSET;
+ protected String markupURL = EndpointConfigurationInfo.UNSET;
/** . */
protected String registrationURL;
@@ -152,6 +150,6 @@
public boolean isAvailable()
{
- return !UNSET.equals(serviceDescriptionURL) && !UNSET.equals(markupURL);
+ return !EndpointConfigurationInfo.UNSET.equals(serviceDescriptionURL) && !EndpointConfigurationInfo.UNSET.equals(markupURL);
}
}
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-03-04 02:18:31 UTC (rev 6524)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-03-04 02:21:15 UTC (rev 6525)
@@ -32,6 +32,12 @@
<method name="activateConsumerWith">
<trans-attribute>Required</trans-attribute>
</method>
+ <method name="updateProducerInfo">
+ <trans-attribute>Required</trans-attribute>
+ </method>
+ <method name="createConsumer">
+ <trans-attribute>Required</trans-attribute>
+ </method>
</metadata>
<!-- TRANSACTIONS -->
17 years, 4 months
JBoss Portal SVN: r6524 - trunk/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 21:18:31 -0500 (Sat, 03 Mar 2007)
New Revision: 6524
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectBean.java
Log:
remove useless commented code
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectBean.java 2007-03-04 02:15:05 UTC (rev 6523)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectBean.java 2007-03-04 02:18:31 UTC (rev 6524)
@@ -45,11 +45,6 @@
return po.getId().toString(PortalObjectId.LEGACY_BASE64_FORMAT);
}
-// public void setId(String id)
-// {
-// // Do nothing
-// }
-
public String getName()
{
return po.getName();
17 years, 4 months
JBoss Portal SVN: r6523 - trunk/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 21:15:05 -0500 (Sat, 03 Mar 2007)
New Revision: 6523
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
Log:
remove useless commented code
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-04 02:07:37 UTC (rev 6522)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-03-04 02:15:05 UTC (rev 6523)
@@ -449,53 +449,4 @@
//
DelegatingPropertyResolver.registerDecorator(InstanceDefinition.class, instanceDecorator);
}
-
-// public static void sortInstances(List instances, final String column, final boolean ascending)
-// {
-// Comparator comparator = new Comparator()
-// {
-// public int compare(Object o1, Object o2)
-// {
-// if (column == null)
-// {
-// return 0;
-// }
-// if (column.equals("id"))
-// {
-// Instance i1 = (Instance)((Object[])o1)[0];
-// Instance i2 = (Instance)((Object[])o2)[0];
-// return ascending ? i1.getId().compareToIgnoreCase(i2.getId()) : i2.getId()
-// .compareToIgnoreCase(i1.getId());
-// }
-// if (column.equals("portlet"))
-// {
-// Portlet p1 = (Portlet)((Object[])o1)[1];
-// Portlet p2 = (Portlet)((Object[])o2)[1];
-//
-// LocalizedString displayName = p1.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME);
-// FacesContext ctx = FacesContext.getCurrentInstance();
-// Locale locale = ctx.getExternalContext().getRequestLocale();
-// String name1 = displayName.getString(locale, true);
-// displayName = p2.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME);
-// String name2 = displayName.getString(locale, true);
-//
-// if (name1 == null || name2 == null)
-// {
-// return 0;
-// }
-//
-// return ascending ? name1.compareToIgnoreCase(name2) : name2
-// .compareToIgnoreCase(name1);
-// }
-//
-// else
-// {
-// return 0;
-// }
-// }
-// };
-// Collections.sort(instances, comparator);
-// }
-
-
}
17 years, 4 months
JBoss Portal SVN: r6522 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 21:07:37 -0500 (Sat, 03 Mar 2007)
New Revision: 6522
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
Log:
center update/cancel buttons on security and theme editors
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04 02:07:37 UTC (rev 6522)
@@ -26,13 +26,11 @@
</td>
</tr>
</c:forEach>
- <tr>
- <td colspan="2">
- <ui:insert name="form_submit"/>
- </td>
- </tr>
</tbody>
</table>
+ <div style="text-align:center;padding: 1em 0 1em 0">
+ <ui:insert name="form_submit"/>
+ </div>
</h:form>
</div>
\ No newline at end of file
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04 02:07:37 UTC (rev 6522)
@@ -40,14 +40,12 @@
</h:selectOneMenu>
</td>
</tr>
- <tr>
- <td colspan="2">
- <ui:insert name="form_submit"/>
- </td>
- </tr>
</tbody>
</table>
</fieldset>
+ <div style="text-align:center;padding: 1em 0 1em 0">
+ <ui:insert name="form_submit"/>
+ </div>
</h:form>
</h:panelGroup>
</div>
\ No newline at end of file
17 years, 4 months
JBoss Portal SVN: r6521 - in trunk/core-admin/src: main/org/jboss/portal/core/admin/ui/actions and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 21:04:37 -0500 (Sat, 03 Mar 2007)
New Revision: 6521
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
Log:
flow improvement, leverage more facelets
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04 02:04:37 UTC (rev 6521)
@@ -768,19 +768,7 @@
selectObject(po.getParent());
//
- if (po.getType() == PortalObject.TYPE_PORTAL)
- {
- return "portals";
- }
- else if (po.getType() == PortalObject.TYPE_PAGE)
- {
- return "pages";
- }
- else if (po.getType() == PortalObject.TYPE_WINDOW)
- {
- return "windows";
- }
- return null;
+ return "objects";
}
public RoleModule getRoleModule()
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/ThemePropertyAction.java 2007-03-04 02:04:37 UTC (rev 6521)
@@ -214,8 +214,6 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "portals";
}
else if (po.getType() == PortalObject.TYPE_PAGE)
{
@@ -225,8 +223,6 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "pages";
}
else if (po.getType() == PortalObject.TYPE_WINDOW)
{
@@ -236,10 +232,8 @@
FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_INFO, stringMessage, stringMessage);
FacesContext.getCurrentInstance().addMessage("status", message);
}
- pomgr.selectObject(po.getParent());
- return "windows";
}
- return "";
+ return "objects";
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -18,7 +18,7 @@
<td>
<h:selectManyCheckbox
id="cars_#{status.index}"
- style="portlet-form-field"
+ styleClass="portlet-form-field"
value="#{auth.forRole[role]}"
layout="lineDirection">
<f:selectItems value="#{auth.availableActions}"/>
@@ -28,7 +28,7 @@
</c:forEach>
<tr>
<td colspan="2">
- <h:commandButton action="#{auth.execute}" value="Update" styleClass="portlet-form-button"/>
+ <ui:insert name="form_submit"/>
</td>
</tr>
</tbody>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -4,10 +4,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <h:panelGroup styleClass="portlet-section-body"
- id="themepg">
- <h:form
- id="themeform">
+ <h:panelGroup styleClass="portlet-section-body" id="themepg">
+ <h:form id="themeform">
<fieldset style="border: 1px solid;">
<legend>Theme properties</legend>
<table>
@@ -44,8 +42,7 @@
</tr>
<tr>
<td colspan="2">
- <h:commandButton styleClass="portlet-form-button" id="the_command" value="Update"
- action="#{themePropertyAction.execute}" />
+ <ui:insert name="form_submit"/>
</td>
</tr>
</tbody>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -1,13 +1,22 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
<h3>Please set the page permissions</h3>
- <ui:include src="common/editSecurity.xhtml">
+ <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- </ui:include>
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
</ui:define>
</ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -1,19 +1,24 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the display options for the page: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <br/>
- <ui:include src="common/editTheme.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>Please set the display options for the page:
+ <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
+ </h3>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -1,20 +1,23 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the portal permissions</h3>
-
- <ui:include src="common/editSecurity.xhtml">
- <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
- </ui:include>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>Please set the portal permissions</h3>
+ <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+ <ui:param name="auth" value="#{portalobjectmgr.auth}"/>
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update" action="#{auth.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -1,7 +1,8 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="objectTemplate.xhtml">
@@ -10,7 +11,16 @@
<h3>Please set the display options for the portal: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
<p>The settings defined here will be applied to the whole portal including all the pages and windows unless they have been assigned with different settings</p>
<br/>
- <ui:include src="common/editTheme.xhtml"/>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
</ui:define>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-03-04 01:36:28 UTC (rev 6520)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-03-04 02:04:37 UTC (rev 6521)
@@ -1,19 +1,24 @@
<div
- xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
-
-<ui:composition template="objectTemplate.xhtml">
-
- <ui:define name="content">
-
- <h3>Please set the display options for the window: <h:outputText value="#{portalobjectmgr.selectedObject.name}"/></h3>
- <br/>
- <ui:include src="common/editTheme.xhtml"/>
-
- </ui:define>
-
-</ui:composition>
-
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:composition template="objectTemplate.xhtml">
+ <ui:define name="content">
+ <h3>Please set the display options for the window:
+ <h:outputText value="#{portalobjectmgr.selectedObject.name}"/>
+ </h3>
+ <ui:decorate template="common/editTheme.xhtml">
+ <ui:define name="form_submit">
+ <h:form>
+ <h:commandButton value="Update" action="#{themePropertyAction.execute}" styleClass="portlet-form-button"/>
+ <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button">
+ <f:param name="id" value="#{node.id}"/>
+ </h:commandButton>
+ </h:form>
+ </ui:define>
+ </ui:decorate>
+ </ui:define>
+ </ui:composition>
</div>
17 years, 4 months
JBoss Portal SVN: r6520 - trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-03-03 20:36:28 -0500 (Sat, 03 Mar 2007)
New Revision: 6520
Modified:
trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
Log:
PortletManagement and Registration URL are not mandatory so accept null values.
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-03-04 01:11:03 UTC (rev 6519)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/consumer/hibernate/domain.hbm.xml 2007-03-04 01:36:28 UTC (rev 6520)
@@ -62,8 +62,8 @@
</id>
<property name="serviceDescriptionURL" column="SD_URL" type="java.lang.String" not-null="true"/>
<property name="markupURL" column="M_URL" type="java.lang.String" not-null="true"/>
- <property name="portletManagementURL" column="PM_URL" type="java.lang.String" not-null="true"/>
- <property name="registrationURL" column="R_URL" type="java.lang.String" not-null="true"/>
+ <property name="portletManagementURL" column="PM_URL" type="java.lang.String" not-null="false"/>
+ <property name="registrationURL" column="R_URL" type="java.lang.String" not-null="false"/>
<property name="wsdlDefinitionURL" column="WSDL_URL" type="java.lang.String" not-null="false"/>
</class>
17 years, 4 months
JBoss Portal SVN: r6519 - trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 20:11:03 -0500 (Sat, 03 Mar 2007)
New Revision: 6519
Modified:
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml
Log:
fix broken top nav
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml 2007-03-04 01:09:21 UTC (rev 6518)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/tabTemplate.xhtml 2007-03-04 01:11:03 UTC (rev 6519)
@@ -5,7 +5,7 @@
<h:form>
<ul class="topnav">
<li>
- <h:commandLink value="Portal Objects" action="portals" actionListener="#{portalobjectmgr.selectRootObject}"/>
+ <h:commandLink value="Portal Objects" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/>
</li>
<li>
<h:commandLink value="Portlet Instances" action="instances"/>
17 years, 4 months
JBoss Portal SVN: r6518 - in trunk/core-admin/src: main/org/jboss/portal/core/admin/ui and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 20:09:21 -0500 (Sat, 03 Mar 2007)
New Revision: 6518
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
Log:
fix window content selection
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-04 00:45:46 UTC (rev 6517)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-03-04 01:09:21 UTC (rev 6518)
@@ -88,6 +88,8 @@
width:11em;
}
+/* Style a table for form layout */
+
.admin-ui table.form {
border-spacing: 10px 4px;
margin-left: -10px;
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04 00:45:46 UTC (rev 6517)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-03-04 01:09:21 UTC (rev 6518)
@@ -460,16 +460,6 @@
selectedId = new PortalObjectId();
}
selectedObject = getObjectFromId(selectedId);
- if (selectedObject instanceof Window)
- {
- Window window = (Window)selectedObject;
- selectedContentType = window.getContentType();
- Content content = window.getContent();
- if (content != null)
- {
- selectedContentURI = content.getURI();
- }
- }
}
return selectedObject;
}
@@ -556,6 +546,13 @@
case PortalObject.TYPE_PAGE:
break;
case PortalObject.TYPE_WINDOW:
+ Window window = (Window)object;
+ selectedContentType = window.getContentType();
+ Content content = window.getContent();
+ if (content != null)
+ {
+ selectedContentURI = content.getURI();
+ }
break;
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-04 00:45:46 UTC (rev 6517)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-03-04 01:09:21 UTC (rev 6518)
@@ -7,12 +7,17 @@
<ui:define name="content">
- <!-- -->
- <h:form id="portal_form">
- <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
+ <!-- Sub page addition -->
+ <div style="padding:1em 0 0 0">
+ <div class="portlet-font">Create a portal:</div>
+ <div style="padding:1em 0 1em 0">
+ <h:form id="portal_form">
+ <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/>
+ <h:commandButton action="#{portalAction.addPortal}" value="Add portal" styleClass="portlet-form-button"/>
+ <h:message for="name" errorClass="portlet-msg-error"/>
+ </h:form>
+ </div>
+ </div>
<!-- Separation -->
<hr/>
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-04 00:45:46 UTC (rev 6517)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-04 01:09:21 UTC (rev 6518)
@@ -25,9 +25,6 @@
<div class="portlet-font">Default page:</div>
<div style="padding:1em 0 1em 0">
<h:form>
- <h:outputLabel for="name">
- <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/>
- </h:outputLabel>
<h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
<f:selectItems value="#{portalobjectmgr.portalPageItems}" />
</h:selectOneMenu>
17 years, 4 months
JBoss Portal SVN: r6517 - trunk/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 19:45:46 -0500 (Sat, 03 Mar 2007)
New Revision: 6517
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
Log:
remove System.out;println()
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-04 00:45:15 UTC (rev 6516)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-04 00:45:46 UTC (rev 6517)
@@ -48,7 +48,6 @@
if (phaseEvent.getPhaseId() == PhaseId.RESTORE_VIEW ||
phaseEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)
{
- System.out.println("BEFORE REFRESH");
FacesContext ctx = phaseEvent.getFacesContext();
//
@@ -62,7 +61,6 @@
//
PortletManagerBean portletmgr = (PortletManagerBean)ctx.getApplication().createValueBinding("#{portletmgr}").getValue(ctx);
portletmgr.refresh();
- System.out.println("AFTER REFRESH");
}
}
17 years, 4 months
JBoss Portal SVN: r6516 - in trunk: core-admin/src/main/org/jboss/portal/core/admin/ui and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-03-03 19:45:15 -0500 (Sat, 03 Mar 2007)
New Revision: 6516
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
Log:
make session bean refreshing work correctly with respect to hibernate
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-03-03 23:14:55 UTC (rev 6515)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-03-04 00:45:15 UTC (rev 6516)
@@ -232,6 +232,7 @@
public void setChildren(Map children)
{
+ System.out.println("Set on " + path + " " + children);
this.children = children;
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-03 23:14:55 UTC (rev 6515)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/Refresher.java 2007-03-04 00:45:15 UTC (rev 6516)
@@ -45,8 +45,10 @@
public void beforePhase(PhaseEvent phaseEvent)
{
- if (phaseEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)
+ if (phaseEvent.getPhaseId() == PhaseId.RESTORE_VIEW ||
+ phaseEvent.getPhaseId() == PhaseId.RENDER_RESPONSE)
{
+ System.out.println("BEFORE REFRESH");
FacesContext ctx = phaseEvent.getFacesContext();
//
@@ -60,6 +62,7 @@
//
PortletManagerBean portletmgr = (PortletManagerBean)ctx.getApplication().createValueBinding("#{portletmgr}").getValue(ctx);
portletmgr.refresh();
+ System.out.println("AFTER REFRESH");
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-03 23:14:55 UTC (rev 6515)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-03-04 00:45:15 UTC (rev 6516)
@@ -9,22 +9,32 @@
<ui:define name="content">
<!-- Sub page addition -->
- <h:form id="portal_form">
- <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
- <h:commandButton action="#{addPageAction.execute}" value="Add page" styleClass="portlet-form-button"/>
- <h:message for="name" errorClass="portlet-msg-error"/>
- </h:form>
+ <div style="padding:1em 0 0 0">
+ <div class="portlet-font">Create a nested page:</div>
+ <div style="padding:1em 0 1em 0">
+ <h:form>
+ <h:inputText id="name" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/>
+ <h:commandButton action="#{addPageAction.execute}" value="Add" styleClass="portlet-form-button"/>
+ <h:message for="name" errorClass="portlet-msg-error"/>
+ </h:form>
+ </div>
+ </div>
<!-- Default page -->
- <h:form>
- <h:outputLabel for="name">
- <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/>
- </h:outputLabel>
- <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
- <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
- </h:selectOneMenu>
- <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
- </h:form>
+ <div style="padding:1em 0 0 0">
+ <div class="portlet-font">Default page:</div>
+ <div style="padding:1em 0 1em 0">
+ <h:form>
+ <h:outputLabel for="name">
+ <h:outputText styleClass="portlet-form-field-label" value="Default Page:"/>
+ </h:outputLabel>
+ <h:selectOneMenu id="name" styleClass="portlet-form-field" value="#{portalAction.defaultPageName}">
+ <f:selectItems value="#{portalobjectmgr.portalPageItems}" />
+ </h:selectOneMenu>
+ <h:commandButton styleClass="portlet-form-button" value="Update" action="objects"/>
+ </h:form>
+ </div>
+ </div>
<!-- Separation -->
<hr/>
17 years, 4 months