JBoss Portal SVN: r11815 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-sar/conf/bundles and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 15:38:50 -0400 (Thu, 04 Sep 2008)
New Revision: 11815
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
Log:
JBPORTAL-2130: Creation of alrady existing role ends up (fails) with an exception
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java (from rev 11814, branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java 2008-09-04 19:38:50 UTC (rev 11815)
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * 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.identity.ui.validators;
+
+import java.util.ResourceBundle;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+import javax.portlet.PortletContext;
+
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+
+public class RoleValidator implements Validator
+{
+ /** The role module */
+ private RoleModule roleModule;
+
+ /** The logger */
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(RoleValidator.class);
+
+ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
+ {
+ String rolename = (String) value;
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
+ PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
+ roleModule = (RoleModule) portletContext.getAttribute("RoleModule");
+
+ try
+ {
+ @SuppressWarnings("unused")
+ Role u = roleModule.findRoleByName(rolename);
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN")));
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR")));
+ }
+ catch (IdentityException e)
+ {
+ // TODO: Throw a catchable error
+ if (e.getMessage().contains("No such role"))
+ {
+ // ignore
+ }
+ else
+ {
+ log.error("Error validation rolename", e);
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR")));
+ }
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-04 19:35:41 UTC (rev 11814)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-04 19:38:50 UTC (rev 11815)
@@ -169,7 +169,9 @@
IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user.
IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken.
-IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating username.
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating the username.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=This role name is already taken.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Error while validating the role name.
IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match.
IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password.
IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address.
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-09-04 19:35:41 UTC (rev 11814)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-09-04 19:38:50 UTC (rev 11815)
@@ -199,6 +199,10 @@
<validator-id>UsernameValidator</validator-id>
<validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class>
</validator>
+ <validator>
+ <validator-id>RoleValidator</validator-id>
+ <validator-class>org.jboss.portal.core.identity.ui.validators.RoleValidator</validator-class>
+ </validator>
<validator>
<validator-id>PasswordValidator</validator-id>
<validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-09-04 19:35:41 UTC (rev 11814)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2008-09-04 19:38:50 UTC (rev 11815)
@@ -21,9 +21,12 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3>
<h:form>
- <h:panelGrid columns="2">
+ <h:panelGrid columns="3">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
- <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true"/>
+ <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true">
+ <f:validator validatorId="RoleValidator"/>
+ </h:inputText>
+ <h:message for="rolename" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
17 years, 8 months
JBoss Portal SVN: r11814 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: resources/portal-identity-sar/conf/bundles and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 15:35:41 -0400 (Thu, 04 Sep 2008)
New Revision: 11814
Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
Log:
JBPORTAL-2130: Creation of alrady existing role ends up (fails) with an exception
Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/RoleValidator.java 2008-09-04 19:35:41 UTC (rev 11814)
@@ -0,0 +1,88 @@
+/******************************************************************************
+ * 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.identity.ui.validators;
+
+import java.util.ResourceBundle;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
+import javax.portlet.PortletContext;
+
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.RoleModule;
+
+/**
+ * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+
+public class RoleValidator implements Validator
+{
+ /** The role module */
+ private RoleModule roleModule;
+
+ /** The logger */
+ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(RoleValidator.class);
+
+ public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException
+ {
+ String rolename = (String) value;
+ ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", context.getViewRoot().getLocale());
+ PortletContext portletContext = (PortletContext) context.getExternalContext().getContext();
+ roleModule = (RoleModule) portletContext.getAttribute("RoleModule");
+
+ try
+ {
+ @SuppressWarnings("unused")
+ Role u = roleModule.findRoleByName(rolename);
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN")));
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR")));
+ }
+ catch (IdentityException e)
+ {
+ // TODO: Throw a catchable error
+ if (e.getMessage().contains("No such role"))
+ {
+ // ignore
+ }
+ else
+ {
+ log.error("Error validation rolename", e);
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR")));
+ }
+ }
+ }
+}
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-04 17:23:53 UTC (rev 11813)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-04 19:35:41 UTC (rev 11814)
@@ -166,7 +166,9 @@
IDENTITY_VALIDATION_ERROR_REGISTRATION=Failed to register user.
IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=This username is already taken.
-IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating username.
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=Error while validating the username.
+IDENTITY_VALIDATION_ERROR_ROLENAME_TAKEN=This role name is already taken.
+IDENTITY_VALIDATION_ERROR_ROLENAME_ERROR=Error while validating the role name.
IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=The passwords doesn't match.
IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=Error while validating password.
IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Invalid E-Mail address.
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-09-04 17:23:53 UTC (rev 11813)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2008-09-04 19:35:41 UTC (rev 11814)
@@ -209,6 +209,10 @@
<validator-id>UsernameValidator</validator-id>
<validator-class>org.jboss.portal.core.identity.ui.validators.UsernameValidator</validator-class>
</validator>
+ <validator>
+ <validator-id>RoleValidator</validator-id>
+ <validator-class>org.jboss.portal.core.identity.ui.validators.RoleValidator</validator-class>
+ </validator>
<validator>
<validator-id>PasswordValidator</validator-id>
<validator-class>org.jboss.portal.core.identity.ui.validators.PasswordValidator</validator-class>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-09-04 17:23:53 UTC (rev 11813)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/roles/createRole.xhtml 2008-09-04 19:35:41 UTC (rev 11814)
@@ -21,9 +21,12 @@
<ui:define name="content">
<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3>
<h:form>
- <h:panelGrid columns="2">
+ <h:panelGrid columns="3">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
- <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true"/>
+ <h:inputText id="rolename" value="#{createrolemgr.uiRole.name}" required="true">
+ <f:validator validatorId="RoleValidator"/>
+ </h:inputText>
+ <h:message for="rolename" infoClass="portlet-msg-success" errorClass="portlet-msg-error" fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_DISPLAY}"/>
<h:inputText id="roledisplayname" value="#{createrolemgr.uiRole.displayName}"/>
17 years, 8 months
JBoss Portal SVN: r11813 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-04 13:23:53 -0400 (Thu, 04 Sep 2008)
New Revision: 11813
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
Log:
- CoordinationBean refactoring:
+ provided default implementation of resetSelection that calls refresh on the main manager
+ added initKnowing for better consistency
+ create, delete and rename should now call resetSelection when done
- Improved CoordinationType
- Fixed problems with deleteSelected and renameSelected
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -144,7 +144,6 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
- managerBean.refresh();
return resetSelection();
}
@@ -153,7 +152,7 @@
aliasName = null;
originalQNames = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -164,7 +163,7 @@
AliasBindingInfo alias = binding.getAlias();
managerBean.getCoordinationService().removeAliasBinding(alias);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String oldName, String newName) throws IllegalCoordinationException
@@ -175,7 +174,7 @@
AliasBindingInfo alias = binding.getAlias();
managerBean.getCoordinationService().renameAliasBinding(alias, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public void extractInfoFrom(Window window, PortletInfo info)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -22,15 +22,6 @@
package org.jboss.portal.core.admin.ui.coordination;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
import org.jboss.portal.core.controller.coordination.CoordinationConfigurator;
@@ -47,6 +38,14 @@
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.portlet.info.PortletInfo;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -70,55 +69,34 @@
private enum CoordinationType
{
wiring() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_WIRING";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}},
parameter() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_PARAMETER";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}},
alias() {
- private CoordinationBean bean;
-
String localizationKey()
{
return "COORDINATION_ALIAS";
- }
- CoordinationBean getBean()
- {
- return bean;
- }
- void setBean(CoordinationBean bean)
- {
- this.bean = bean;
}};
- abstract String localizationKey();
- abstract CoordinationBean getBean();
+ private CoordinationBean bean;
- abstract void setBean(CoordinationBean bean);
+ CoordinationBean getBean()
+ {
+ return bean;
+ }
+
+ void setBean(CoordinationBean bean)
+ {
+ this.bean = bean;
+ }
+
+ abstract String localizationKey();
}
abstract static class CoordinationBean
@@ -154,12 +132,18 @@
public abstract String create() throws IllegalCoordinationException;
- public abstract String resetSelection();
+ public String resetSelection()
+ {
+ managerBean.refresh();
+ return CoordinationManagerBean.EDIT_COORDINATION;
+ }
public String cancel()
{
return resetSelection();
}
+
+ public abstract void initKnowing(Collection<PortalObject> children);
}
public Page getSelectedPage()
@@ -286,31 +270,37 @@
try
{
// reset the different managers as they are in session scope but need to be re-initialized each time a new
- // page is reloaded, also need to update the holders for the different managers
- managers.put(CoordinationType.alias.name(), replaceInSession("aliasManager", new AliasBindingManagerBean(this)));
- managers.put(CoordinationType.wiring.name(), replaceInSession("eventManager", new EventWiringManagerBean(this)));
- managers.put(CoordinationType.parameter.name(), replaceInSession("parameterManager", new ParameterBindingManagerBean(this)));
+ // page is reloaded
+ AliasBindingManagerBean aliasManager = new AliasBindingManagerBean(this);
+ EventWiringManagerBean eventManager = new EventWiringManagerBean(this);
+ ParameterBindingManagerBean parameterManager = new ParameterBindingManagerBean(this);
+ managers.put(CoordinationType.alias.name(), replaceInSession("aliasManager", aliasManager));
+ managers.put(CoordinationType.wiring.name(), replaceInSession("eventManager", eventManager));
+ managers.put(CoordinationType.parameter.name(), replaceInSession("parameterManager", parameterManager));
Page selectedPage = getSelectedPage();
- if (isExplicitEventsUsed())
+ boolean explicitEventsUsed = isExplicitEventsUsed();
+ boolean explicitParametersUsed = isExplicitParametersUsed();
+
+ aliasManager.loadInfoFrom(selectedPage);
+ if (explicitEventsUsed)
{
- managers.get(CoordinationType.wiring.name()).loadInfoFrom(selectedPage);
+ eventManager.loadInfoFrom(selectedPage);
}
- if (isExplicitParametersUsed())
+ if (explicitParametersUsed)
{
- managers.get(CoordinationType.parameter.name()).loadInfoFrom(selectedPage);
+ parameterManager.loadInfoFrom(selectedPage);
}
- managers.get(CoordinationType.alias.name()).loadInfoFrom(selectedPage);
Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
if (!children.isEmpty())
{
- if (isExplicitParametersUsed())
+ aliasManager.initKnowing(children);
+ if (explicitParametersUsed)
{
- ((ParameterBindingManagerBean)managers.get(CoordinationType.parameter.name())).initKnowing(children);
+ parameterManager.initKnowing(children);
}
- ((AliasBindingManagerBean)managers.get(CoordinationType.alias.name())).initKnowing(children);
for (PortalObject po : children)
{
@@ -323,15 +313,15 @@
{
PortletInfo info = instance.getPortlet().getInfo();
- if (isExplicitParametersUsed())
+ aliasManager.extractInfoFrom(window, info);
+ if (explicitEventsUsed)
{
- managers.get(CoordinationType.parameter.name()).extractInfoFrom(window, info);
+ eventManager.extractInfoFrom(window, info);
}
- if (isExplicitEventsUsed())
+ if (explicitParametersUsed)
{
- managers.get(CoordinationType.wiring.name()).extractInfoFrom(window, info);
+ parameterManager.extractInfoFrom(window, info);
}
- managers.get(CoordinationType.alias.name()).extractInfoFrom(window, info);
}
}
}
@@ -441,8 +431,7 @@
{
selectedName = getFacesParam(SELECTED_NAME);
selectedType = CoordinationType.valueOf(getFacesParam(SELECTED_TYPE));
-
- selectedType.setBean(managers.get(getFacesParam(SELECTED_TYPE)));
+ selectedType.setBean(managers.get(selectedType.name()));
}
public String getSelectedName()
@@ -459,7 +448,6 @@
public String deleteSelected(ActionEvent actionEvent)
{
- select(actionEvent);
if (selectedType != null)
{
try
@@ -484,8 +472,6 @@
*/
public void refresh()
{
- // need to make sure that POMB has a selection...
-// pomb.selectObject(selectedObjectId);
editCoordination();
}
@@ -511,6 +497,6 @@
selectedType = null;
selectedName = null;
newName = null;
- return ""; //EDIT_COORDINATION;
+ return EDIT_COORDINATION;
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/EventWiringManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -25,6 +25,7 @@
import org.jboss.portal.core.controller.coordination.EventWiringInfo;
import org.jboss.portal.core.controller.coordination.IllegalCoordinationException;
import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.portlet.info.EventInfo;
import org.jboss.portal.portlet.info.EventingInfo;
@@ -328,7 +329,7 @@
selectedDestinationEvent = null;
selectedDestinationWindows = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -339,7 +340,7 @@
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().removeEventWiring(event);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String oldName, String newName) throws IllegalCoordinationException
@@ -350,7 +351,7 @@
EventWiringInfo event = displayEvent.getEventInfo();
managerBean.getCoordinationService().renameEventWiring(event, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public void extractInfoFrom(Window window, PortletInfo info)
@@ -361,6 +362,11 @@
eventNameToWindowDestinations = addEventInfoFor(window, eventingInfo.getConsumedEvents(), eventNameToWindowDestinations);
}
+ public void initKnowing(Collection<PortalObject> children)
+ {
+ // nothing to do here
+ }
+
public static class DisplayEventWiring implements Comparable
{
private List<Window> sourceWindows;
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-04 15:56:54 UTC (rev 11812)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/ParameterBindingManagerBean.java 2008-09-04 17:23:53 UTC (rev 11813)
@@ -156,7 +156,7 @@
windowBindingName = null;
selectedParameterWindowPairs = null;
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return super.resetSelection();
}
public String delete(String name) throws IllegalCoordinationException
@@ -167,7 +167,7 @@
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().removeWindowBinding(bindingInfo);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public String rename(String name, String newName) throws IllegalCoordinationException
@@ -178,7 +178,7 @@
WindowBindingInfo bindingInfo = displayParam.getBindingInfo();
managerBean.getCoordinationService().renameWindowBinding(bindingInfo, newName);
}
- return CoordinationManagerBean.EDIT_COORDINATION;
+ return resetSelection();
}
public static class DisplayParameterBinding implements Comparable
17 years, 8 months
JBoss Portal SVN: r11812 - branches.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-04 11:56:54 -0400 (Thu, 04 Sep 2008)
New Revision: 11812
Added:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/
Log:
Patch for JBPORTAL-2109
Copied: branches/JBoss_Portal_2_6_6_JBPORTAL-2109 (from rev 11811, tags/JBoss_Portal_2_6_6)
17 years, 8 months
JBoss Portal SVN: r11811 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 11:22:07 -0400 (Thu, 04 Sep 2008)
New Revision: 11811
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
Log:
Cleanup
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 15:18:43 UTC (rev 11810)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 15:22:07 UTC (rev 11811)
@@ -443,17 +443,6 @@
selectedType = CoordinationType.valueOf(getFacesParam(SELECTED_TYPE));
selectedType.setBean(managers.get(getFacesParam(SELECTED_TYPE)));
-
- /*
- // make manager accessible to CoordinationType
- eventManagerHolder.set(eventManager);
-<<<<<<< .mine
- parameterBindingManagerHolder.set(parameterManager);
-=======
- parameterManagerHolder.set(parameterManager);
->>>>>>> .r11801
- aliasManagerHolder.set(aliasManager);
- */
}
public String getSelectedName()
17 years, 8 months
JBoss Portal SVN: r11810 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 11:18:43 -0400 (Thu, 04 Sep 2008)
New Revision: 11810
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
Log:
Put 'keep' because 'overwrite' is evil :)
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-09-04 15:17:06 UTC (rev 11809)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-coordination-samples-war/WEB-INF/default-object.xml 2008-09-04 15:18:43 UTC (rev 11810)
@@ -29,7 +29,7 @@
<deployments>
<deployment>
<parent-ref>default</parent-ref>
- <if-exists>overwrite</if-exists>
+ <if-exists>keep</if-exists>
<page>
<page-name>Coordination Samples</page-name>
<implicit-mode>FALSE</implicit-mode>
17 years, 8 months
JBoss Portal SVN: r11809 - modules/cms/trunk.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-04 11:17:06 -0400 (Thu, 04 Sep 2008)
New Revision: 11809
Modified:
modules/cms/trunk/
Log:
cleanup (ignoring target)
Property changes on: modules/cms/trunk
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
17 years, 8 months
JBoss Portal SVN: r11808 - in branches/JBoss_Portal_Branch_2_7: core and 5 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-04 11:12:02 -0400 (Thu, 04 Sep 2008)
New Revision: 11808
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core/build.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
Log:
[JBPORTAL-2149]mergigng changes from Branch26
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -120,9 +120,13 @@
<componentref name="portlet" version="2.0-Draft32"/>
<componentref name="sun-jstl" version="1.2"/>
<componentref name="jboss/web" version="2.1.0.GA"/>
+
+ <!-- To use new jboss-cahce/hibernate integration library-->
+ <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
+
</build>
- <synchronizeinfo/>
+ <synchronizeinfo/>
<target name="generate-lib-file"
description="generate libraries.ent and thirdparty license info"
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -378,6 +378,11 @@
</filterset>
<fileset dir="${build.resources}/jboss-portal" includes="**/*.xml"/>
</copy>
+
+ <!-- add jboss-cache-hibernate integration jar -->
+ <copy todir="${build.resources}/jboss-portal-ha.sar/lib">
+ <fileset dir="${org/jboss/cluster/hibernate.jbc.cacheprovider.root}/lib" includes="hibernate-jbc-cacheprovider.jar"/>
+ </copy>
<implode
dir="${build.resources}/jboss-portal-ha.sar"
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -428,9 +428,11 @@
org.jboss.cache.JBossTransactionManagerLookup
</attribute>
- <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+ <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="IsolationLevel">READ_COMMITTED</attribute>
+ <attribute name="CacheMode">INVALIDATION_SYNC</attribute>
+
<attribute name="CacheMode">REPL_SYNC</attribute>
<attribute name="ClusterName">
@@ -499,13 +501,7 @@
</config>
</attribute>
</mbean>
-
- <mbean code="org.jboss.portal.jems.hibernate.JBossTreeCacheProvider"
- name="portal:service=TreeCacheProvider,type=hibernate">
- <depends optional-attribute-name="CacheName">
- portal:service=TreeCache,type=hibernate
- </depends>
- </mbean>
+
@portal.single.xml.open@
-->
@@ -513,10 +509,7 @@
<mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
- <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
- <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
- @portal.single.xml.open@ -->
+ <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/user/hibernate.cfg.xml</attribute>
<attribute name="SetupLocation">conf/hibernate/user/setup.txt</attribute>
@@ -526,10 +519,6 @@
xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
- <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
- <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
- <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
- @portal.single.xml.open@ -->
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/instance/hibernate.cfg.xml</attribute>
<attribute name="JNDIName">java:/portal/InstanceSessionFactory</attribute>
@@ -538,9 +527,6 @@
xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
- <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
- <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
- @portal.single.xml.open@ -->
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/portal/hibernate.cfg.xml</attribute>
<attribute name="JNDIName">java:/portal/PortalObjectSessionFactory</attribute>
@@ -548,10 +534,7 @@
<mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=Portlet"
xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
- <!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
- <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
- @portal.single.xml.open@ -->
+ <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/portlet/hibernate.cfg.xml</attribute>
<attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -30,14 +30,14 @@
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
<property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_query_cache">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
- <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -55,7 +55,7 @@
inverse="true"
cascade="none"
fetch="select"
- lazy="extra">
+ lazy="true">
<cache usage="@portal.hibernate.cache.usage@"/>
<key column="PARENT_KEY"/>
<map-key
@@ -105,11 +105,16 @@
column="LISTENER"/>
<map
name="displayNames"
+ cascade="none"
+ fetch="select"
+ lazy="true"
table="JBP_PORTAL_OBJECT_DNAMES">
+ <cache usage="@portal.hibernate.cache.usage@"/>
<key column="INSTANCE_PK"/>
<map-key type="locale" column="LOCALE"/>
- <element type="string" column="TEXT"/>
- </map>
+ <element type="string" column="TEXT"/>
+ </map>
+
<map
name="declaredPropertyMap"
cascade="all-delete-orphan"
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -30,13 +30,13 @@
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
<property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_query_cache">false</property>
<property name="hibernate.hbm2ddl.auto">update</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
- <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -30,13 +30,13 @@
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
<property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
- <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-04 13:32:25 UTC (rev 11807)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-04 15:12:02 UTC (rev 11808)
@@ -30,13 +30,13 @@
<property name="connection.datasource">java:@portal.datasource.name@</property>
<property name="show_sql">@portal.sql.show@</property>
<property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
+ <property name="cache.use_query_cache">false</property>
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
- <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
17 years, 8 months
JBoss Portal SVN: r11807 - modules/cms/trunk/cms-jackrabbit/src/test/resources.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 09:32:25 -0400 (Thu, 04 Sep 2008)
New Revision: 11807
Modified:
modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml
Log:
Oups
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml 2008-09-04 13:31:47 UTC (rev 11806)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml 2008-09-04 13:32:25 UTC (rev 11807)
@@ -3,7 +3,6 @@
xmlns="urn:jboss:jboss-unit:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
- <!--
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -69,7 +68,7 @@
<class name="org.jboss.portal.cms.test.commands.TestSearch"/>
</test>
</pojo>
- -->
+
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -89,7 +88,7 @@
<class name="org.jboss.portal.cms.test.security.TestNewReadCommand"/>
</test>
</pojo>
- <!--
+
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -106,5 +105,4 @@
<class name="org.jboss.portal.cms.test.workflow.TestWorkflowEnvironment"/>
</test>
</pojo>
- -->
</jboss-unit>
17 years, 8 months
JBoss Portal SVN: r11806 - in modules/cms/trunk/cms-jackrabbit/src/test: resources and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 09:31:47 -0400 (Thu, 04 Sep 2008)
New Revision: 11806
Added:
modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml
Modified:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java
modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml
Log:
Fix test case for JBoss Unit usage
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java 2008-09-04 12:33:28 UTC (rev 11805)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java 2008-09-04 13:31:47 UTC (rev 11806)
@@ -46,12 +46,16 @@
import org.jboss.portal.server.impl.invocation.JBossInterceptorStack;
import org.jboss.portal.cms.test.commands.AbstractCommandTestCase;
import org.jboss.portal.cms.test.commands.CMSInterceptorStackFactory;
+import org.jboss.unit.api.pojo.annotations.Test;
+import org.jboss.unit.mc.api.annotations.Bootstrap;
+import static org.jboss.unit.api.Assert.*;
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
*/
-public class TestNewReadCommand extends AbstractCommandTestCase
+@Bootstrap(beanName = "TestCase", resourceName="/jboss-beans-security-test.xml")
+public class TestNewReadCommand extends SecureCommandTestCase
{
String rejectFolderPath = "/default/private";
String allowedFolderPath = "/default/images";
@@ -71,48 +75,6 @@
super();
}
-
- public static TestSuite suite() throws Exception
- {
- return createTestSuite(TestNewReadCommand.class);
- }
-
- /**
- *
- */
- public void setUp() throws Exception
- {
- //override the configration location to include workflow services
- this.configuration = "org/jboss/portal/cms/jboss-beans-security-test.xml";
- super.setUp();
-
- ACLInterceptor aclInterceptor = this.getACLInterceptor();
-
- //Setup the interceptor stack
- CMSInterceptorStackFactory stackFactory = new CMSInterceptorStackFactory();
- Interceptor[] interceptors = new Interceptor[1];
- interceptors[0] = aclInterceptor;
- JBossInterceptorStack stack = new JBossInterceptorStack(interceptors);
- stackFactory.setInterceptorStack(stack);
-
- this.service.setStackFactory(stackFactory);
-
- //Register the IdentityService with the JCR service
- IdentityServiceController identityService = ((AuthorizationProviderImpl)aclInterceptor.getAuthorizationManager().getProvider()).
- getIdentityServiceController();
- this.userModule = (UserModule)identityService.getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE);
- }
-
- /**
- *
- */
- public void tearDown() throws Exception
- {
- super.tearDown();
- this.userModule = null;
- }
-
-
/** @return */
protected ACLInterceptor getACLInterceptor() throws Exception
{
@@ -143,6 +105,7 @@
}
/** @throws Exception */
+ @Test
public void testAnonymous() throws Exception
{
try
Added: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-beans-security-test.xml 2008-09-04 13:31:47 UTC (rev 11806)
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+
+ <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+ <constructor factoryMethod="obtainConfig" factoryClass="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+ <parameter><inject bean="TestCase" property="datasources" state="Instantiated"/></parameter>
+ <parameter><inject bean="TestCase" property="dataSourceName" state="Instantiated"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config">
+ <constructor factoryMethod="getConfig" factoryClass="org.jboss.portal.test.framework.embedded.HibernateSupport">
+ <parameter><inject bean="TestCase" property="dataSourceName" state="Instantiated"/></parameter>
+ <parameter><inject bean="TestCase" property="hibernateConfig" state="Instantiated"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+ </bean>
+
+ <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport">
+ </bean>
+
+ <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport">
+ <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+ </bean>
+
+ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport">
+ <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+ <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport" property="connectionManagerReference"/></property>
+ <property name="config"><inject bean="DataSourceConfig"/></property>
+ </bean>
+
+ <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+ <property name="config"><inject bean="HibernateConfig"/></property>
+ <property name="JNDIName">java:/SessionFactory</property>
+ <property name="mappings">
+ <list elementClass="java.lang.String">
+ <value>domain.hbm.xml</value>
+ <value>domain-identity.hbm.xml</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean name="IdentityTestServiceLoader" class="org.jboss.portal.cms.test.TestServiceLoader">
+ <depends>JNDISupport</depends>
+ <depends>HibernateSupport</depends>
+ <depends>DataSourceSupport</depends>
+ </bean>
+
+ <bean name="IdentityContext" class="org.jboss.portal.identity.IdentityContext">
+ <constructor factoryMethod="loadServices">
+ <factory bean="IdentityTestServiceLoader"/>
+ <parameter class="java.lang.String"><inject bean="TestCase" property="standardIdentityConfig" state="Instantiated"/></parameter>
+ <parameter class="java.lang.String"><inject bean="TestCase" property="identityConfig" state="Instantiated"/></parameter>
+ </constructor>
+ </bean>
+
+ <bean name="UserModule" class="org.jboss.portal.identity.UserModule">
+ <constructor factoryMethod="getObject">
+ <factory bean="IdentityContext" />
+ <parameter>User</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="RoleModule" class="org.jboss.portal.identity.RoleModule">
+ <constructor factoryMethod="getObject">
+ <factory bean="IdentityContext" />
+ <parameter>Role</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="MembershipModule" class="org.jboss.portal.identity.MembershipModule">
+ <constructor factoryMethod="getObject">
+ <factory bean="IdentityContext" />
+ <parameter>Membership</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="UserProfileModule" class="org.jboss.portal.identity.UserProfileModule">
+ <constructor factoryMethod="getObject">
+ <factory bean="IdentityContext" />
+ <parameter>UserProfile</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="IdentityServiceController" class="org.jboss.portal.core.identity.service.IdentityServiceControllerImpl">
+ <property name="configFile">db-config.xml</property>
+ <property name="defaultConfigFile">standardidentity-config.xml</property>
+ <property name="registerMBeans">false</property>
+ </bean>
+
+ <bean name="IdentityDataLoader" class="org.jboss.portal.cms.test.security.IdentityDataLoader">
+ <property name="identityServiceController"><inject bean="IdentityServiceController"/></property>
+ <property name="identitySessionFactory">java:/SessionFactory</property>
+ </bean>
+
+ <!-- setup for cms security testing -->
+ <bean name="AuthorizationProvider" class="org.jboss.portal.cms.security.AuthorizationProviderImpl">
+ <property name="identityServiceController"><inject bean="IdentityServiceController"/></property>
+ <property name="cmsRootUserName">admin</property>
+ </bean>
+
+ <bean name="AuthorizationManager" class="org.jboss.portal.cms.test.security.TestAuthorizationManagerImpl">
+ <property name="provider"><inject bean="AuthorizationProvider"/></property>
+ <property name="JNDIName">java:portal/cms/AuthorizationManager</property>
+ </bean>
+
+ <bean name="ACLInterceptor" class="org.jboss.portal.cms.impl.interceptors.ACLInterceptor">
+ <property name="authorizationManager"><inject bean="AuthorizationManager"/></property>
+ <property name="JNDIName">java:/portal/cms/ACLInterceptor</property>
+ <property name="cmsSessionFactory">java:/SessionFactory</property>
+ <property name="identitySessionFactory">java:/SessionFactory</property>
+ <property name="defaultPolicy">
+ <![CDATA[
+ <policy>
+ <!-- permissions on the root cms node -->
+ <criteria name="path" value="/">
+ <permission name="cms" action="read">
+ <role name="Anonymous"/>
+ </permission>
+ <permission name="cms" action="write">
+ <role name="User"/>
+ </permission>
+ <permission name="cms" action="manage">
+ <role name="Admin"/>
+ </permission>
+ </criteria>
+ <!-- permissions on the default cms node -->
+ <criteria name="path" value="/default">
+ <permission name="cms" action="read">
+ <role name="Anonymous"/>
+ </permission>
+ <permission name="cms" action="write">
+ <role name="User"/>
+ </permission>
+ <permission name="cms" action="manage">
+ <role name="Admin"/>
+ </permission>
+ </criteria>
+ <!-- permissions on the private/protected node -->
+ <criteria name="path" value="/default/private">
+ <permission name="cms" action="manage">
+ <role name="Admin"/>
+ </permission>
+ </criteria>
+ <!--
+ permissions on the /default/support.html node used to test atomicity of copy/move operations
+ -->
+ <criteria name="path" value="/default/support.html">
+ <permission name="cms" action="manage">
+ <role name="User"/>
+ </permission>
+ </criteria>
+ </policy>
+ ]]>
+ </property>
+ </bean>
+</deployment>
Modified: modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml 2008-09-04 12:33:28 UTC (rev 11805)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml 2008-09-04 13:31:47 UTC (rev 11806)
@@ -3,6 +3,7 @@
xmlns="urn:jboss:jboss-unit:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
+ <!--
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -68,7 +69,7 @@
<class name="org.jboss.portal.cms.test.commands.TestSearch"/>
</test>
</pojo>
-
+ -->
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -88,7 +89,7 @@
<class name="org.jboss.portal.cms.test.security.TestNewReadCommand"/>
</test>
</pojo>
-
+ <!--
<pojo>
<parameter name="datasources" value="datasources.xml"/>
<parameter name="dataSourceName" value="hsqldb"/>
@@ -105,4 +106,5 @@
<class name="org.jboss.portal.cms.test.workflow.TestWorkflowEnvironment"/>
</test>
</pojo>
+ -->
</jboss-unit>
17 years, 8 months