JBoss Portal SVN: r11805 - in modules/cms/trunk/cms-jackrabbit/local: jboss-portal/2.7 and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 08:33:28 -0400 (Thu, 04 Sep 2008)
New Revision: 11805
Removed:
modules/cms/trunk/cms-jackrabbit/local/jboss-common-jdbc-wrapper.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-common.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-container.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-dependency.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-jca.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-local-jdbc.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-microcontainer.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-generic-lib.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-jboss-lib.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-lib.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-system.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-transaction.jar
modules/cms/trunk/cms-jackrabbit/local/jboss-xml-binding.jar
modules/cms/trunk/cms-jackrabbit/local/jboss.jar
modules/cms/trunk/cms-jackrabbit/local/jbossha.jar
modules/cms/trunk/cms-jackrabbit/local/jbpm/
modules/cms/trunk/cms-jackrabbit/local/jnp-client.jar
modules/cms/trunk/cms-jackrabbit/local/jnpserver.jar
Log:
Removed unused libs
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-common-jdbc-wrapper.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-common.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-container.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-dependency.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-jca.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-local-jdbc.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-microcontainer.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-generic-lib.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-jboss-lib.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-portal/2.7/portal-test-lib.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-system.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-transaction.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss-xml-binding.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jboss.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jbossha.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jnp-client.jar
===================================================================
(Binary files differ)
Deleted: modules/cms/trunk/cms-jackrabbit/local/jnpserver.jar
===================================================================
(Binary files differ)
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11804 - modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 08:30:57 -0400 (Thu, 04 Sep 2008)
New Revision: 11804
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublish.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
Log:
Merging old cms with CMS module
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublish.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-09-04 12:28:53 UTC (rev 11803)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-09-04 12:30:57 UTC (rev 11804)
@@ -38,27 +38,28 @@
* Called when content is added to the CMS, and needs to be approved by the managers before it can be published to go
* live
*
- * @param content
- * @return returns the process id of the workflow process set in motion
+ * @param content the content to be approved
+ * @return the process id of the workflow process set in motion
+ * @throws WorkflowException if an error occured during the approval process
*/
public long requestApproval(Content content) throws WorkflowException;
/**
* Called when a manager either approves or rejects the publishing of a specific content to go live
*
- * @param processId
+ * @param processId the id of the approval process we are interested in
* @param manager userId of the manager
* @param approved true if approved, false if rejected
*/
public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException;
-
- /**
- * Called when a manager either approves the publishing of a specific content to go live, but at the same time
- * adds his/her own modifications to the original content
+
+ /**
+ * Called when a manager either approves the publishing of a specific content to go live, but at the same time adds
+ * his/her own modifications to the original content
*
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
+ * @param processId the process id of the workflow we're interesting in
+ * @param manager userId of the manager
+ * @param modifiedContent modified content
*/
public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException;
@@ -69,7 +70,7 @@
* @return
* @throws WorkflowException
*/
- public Collection getPendingQueue(String filePath) throws WorkflowException;
+ public Collection<Content> getPendingQueue(String filePath) throws WorkflowException;
/**
* Retrieves a queue of unapproved content for everything in the CMS.
@@ -77,7 +78,7 @@
* @return
* @throws WorkflowException
*/
- public Collection getAllPendingInQueue() throws WorkflowException;
+ public Collection<Content> getAllPendingInQueue() throws WorkflowException;
/**
* Returns role names of Roles that are designated to be Managers in this workflow. Managers approve/deny all content
@@ -85,5 +86,5 @@
*
* @return a Set of role names
*/
- public Set getManagers();
+ public Set<String> getManagers();
}
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-04 12:28:53 UTC (rev 11803)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-09-04 12:30:57 UTC (rev 11804)
@@ -75,7 +75,7 @@
private String processName = null;
private String managerRoles = null;
private String[] managers = null;
- private Set managerSet = null;
+ private Set<String> managerSet = null;
private boolean overwrite = false;
private String from = null;
private String subject = null;
@@ -156,7 +156,7 @@
//process managers that can serve as approvers/rejecters
StringTokenizer st = new StringTokenizer(this.managerRoles, ",");
this.managers = new String[st.countTokens()];
- this.managerSet = new HashSet();
+ this.managerSet = new HashSet<String>();
for (int i = 0; i < managers.length; i++)
{
this.managers[i] = st.nextToken();
@@ -164,10 +164,10 @@
}
this.membershipModule = (MembershipModule)identityServiceController.getIdentityContext().
- getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
this.userModule = (UserModule)identityServiceController.getIdentityContext().
- getObject(IdentityContext.TYPE_USER_MODULE);
+ getObject(IdentityContext.TYPE_USER_MODULE);
}
/**
@@ -256,7 +256,7 @@
/** @param identityServiceController */
public void setIdentityServiceController(
- IdentityServiceController identityServiceController)
+ IdentityServiceController identityServiceController)
{
this.identityServiceController = identityServiceController;
}
@@ -357,13 +357,6 @@
return processId;
}
- /**
- * Called when a manager either approves or rejects the publishing of a specific content to go live
- *
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
- */
public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException
{
JbpmContext jbpmContext = null;
@@ -436,15 +429,7 @@
IOTools.safeClose(jbpmContext);
}
}
-
- /**
- * Called when a manager either approves the publishing of a specific content to go live, but at the same time
- * adds his/her own modifications to the original content
- *
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
- */
+
public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException
{
JbpmContext jbpmContext = null;
@@ -463,28 +448,28 @@
return;
}
- processInstance.getContextInstance().setVariable("approved", new Boolean(true));
+ processInstance.getContextInstance().setVariable("approved", true);
processInstance.getContextInstance().setVariable("modifiedContent", modifiedContent);
- Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
+ @SuppressWarnings("unchecked")
+ Collection<TaskInstance> allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
if (allTasks != null)
{
- for (Iterator itr = allTasks.iterator(); itr.hasNext();)
+ for (TaskInstance currentTask : allTasks)
{
- TaskInstance cour = (TaskInstance)itr.next();
- if (this.isManager(manager, cour.getActorId()))
+ if (this.isManager(manager, currentTask.getActorId()))
{
isManager = true;
- log.debug("Manager=" + cour.getActorId() + "(" + processId + ")");
+ log.debug("Manager=" + currentTask.getActorId() + "(" + processId + ")");
//check and make sure this task instance is not marked for deletion
- if (cour.getVariable(processInstance.getId() + ":" + cour.getId()) != null)
+ if (currentTask.getVariable(processInstance.getId() + ":" + currentTask.getId()) != null)
{
continue;
}
-
- cour.start();
- cour.end("approval");
+
+ currentTask.start();
+ currentTask.end("approval");
break;
}
}
@@ -503,8 +488,7 @@
if (!isManager)
{
- WorkflowException we = new WorkflowException("You are not authorized to Approve/Deny content publish requests");
- throw we;
+ throw new WorkflowException("You are not authorized to Approve/Deny content publish requests");
}
IOTools.safeClose(jbpmContext);
}
@@ -517,9 +501,9 @@
* @return
* @throws WorkflowException
*/
- public Collection getPendingQueue(String filePath) throws WorkflowException
+ public Collection<Content> getPendingQueue(String filePath) throws WorkflowException
{
- Collection pendingQueue = new ArrayList();
+ Collection<Content> pendingQueue = new ArrayList<Content>();
JbpmContext jbpmContext = null;
try
{
@@ -527,17 +511,18 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName);
- List processInstances = graphSession.findProcessInstances(processDef.getId());
+ @SuppressWarnings("unchecked")
+ List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId());
+
if (processInstances != null)
{
- for (int i = 0; i < processInstances.size(); i++)
+ for (ProcessInstance processInstance : processInstances)
{
- ProcessInstance cour = (ProcessInstance)processInstances.get(i);
//iterate through a list of currently pending approval tasks
- if (!cour.hasEnded())
+ if (!processInstance.hasEnded())
{
- Content content = (Content)cour.getContextInstance().getVariable("content");
+ Content content = (Content)processInstance.getContextInstance().getVariable("content");
//apply proper criteria to extract pending content only for the specified file
if (content != null)
@@ -547,7 +532,7 @@
if (criteriaPath.trim().equals(filePath.trim()))
{
- content.setProcessId(String.valueOf(cour.getId()));
+ content.setProcessId(String.valueOf(processInstance.getId()));
pendingQueue.add(content);
}
}
@@ -568,9 +553,9 @@
* @return
* @throws WorkflowException
*/
- public Collection getAllPendingInQueue() throws WorkflowException
+ public Collection<Content> getAllPendingInQueue() throws WorkflowException
{
- Collection pendingQueue = new ArrayList();
+ Collection<Content> pendingQueue = new ArrayList<Content>();
JbpmContext jbpmContext = null;
try
{
@@ -578,22 +563,23 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName);
- List processInstances = graphSession.findProcessInstances(processDef.getId());
+ @SuppressWarnings("unchecked")
+ List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId());
+
if (processInstances != null)
{
- for (int i = 0; i < processInstances.size(); i++)
+ for (ProcessInstance processInstance : processInstances)
{
- ProcessInstance cour = (ProcessInstance)processInstances.get(i);
//iterate through a list of currently pending approval tasks
- if (!cour.hasEnded())
+ if (!processInstance.hasEnded())
{
- Content content = (Content)cour.getContextInstance().getVariable("content");
+ Content content = (Content)processInstance.getContextInstance().getVariable("content");
//apply proper criteria to extract pending content only for the specified file
if (content != null)
{
- content.setProcessId(String.valueOf(cour.getId()));
+ content.setProcessId(String.valueOf(processInstance.getId()));
pendingQueue.add(content);
}
}
@@ -608,7 +594,7 @@
}
/** @return */
- public Set getManagers()
+ public Set<String> getManagers()
{
return this.managerSet;
}
@@ -626,7 +612,7 @@
boolean isManager = false;
Set userRoles = this.membershipModule.getRoles(
- this.userModule.findUserByUserName(user));
+ this.userModule.findUserByUserName(user));
if (userRoles != null)
{
for (Iterator itr = userRoles.iterator(); itr.hasNext();)
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11803 - in modules/cms/trunk/cms-jackrabbit/src: test/java/org/jboss/portal/cms/test/security and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 08:28:53 -0400 (Thu, 04 Sep 2008)
New Revision: 11803
Added:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/DummyCommand.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestACLEnforcer.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestAuthorizationManagerImpl.java
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml
Log:
Merging old cms with CMS module
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-04 11:29:22 UTC (rev 11802)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-04 12:28:53 UTC (rev 11803)
@@ -196,7 +196,7 @@
* @param command
* @return
*/
- private boolean hasReadAccess(User user, JCRCommand command)
+ protected boolean hasReadAccess(User user, JCRCommand command)
{
boolean hasReadAccess = false;
@@ -217,9 +217,12 @@
{
path = ((FileGetListCommand)command).sFilePath;
}
+
+ if (path != null)
+ {
+ hasReadAccess = this.hasReadAccess(user, path);
+ }
- hasReadAccess = this.hasReadAccess(user, path);
-
return hasReadAccess;
}
@@ -229,7 +232,7 @@
* @param path
* @return
*/
- private boolean hasReadAccess(User user, String path)
+ protected boolean hasReadAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "read");
if (!hasAccess)
@@ -250,7 +253,7 @@
* @param command
* @return
*/
- private boolean hasWriteAccess(User user, JCRCommand command)
+ protected boolean hasWriteAccess(User user, JCRCommand command)
{
boolean hasWriteAccess = false;
@@ -284,11 +287,14 @@
path = ((UpdateFileCommand)command).getPath();
}
- hasWriteAccess = this.computeAccess(user, path, "write");
- if (!hasWriteAccess)
+ if (path != null)
{
- //make sure implied manage is not available
- hasWriteAccess = this.computeAccess(user, path, "manage");
+ hasWriteAccess = this.computeAccess(user, path, "write");
+ if (!hasWriteAccess)
+ {
+ //make sure implied manage is not available
+ hasWriteAccess = this.computeAccess(user, path, "manage");
+ }
}
return hasWriteAccess;
@@ -300,7 +306,7 @@
* @param path
* @return
*/
- private boolean hasWriteAccess(User user, String path)
+ protected boolean hasWriteAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "write");
if (!hasAccess)
@@ -316,7 +322,7 @@
* @param command
* @return
*/
- private boolean hasManageAccess(User user, JCRCommand command)
+ protected boolean hasManageAccess(User user, JCRCommand command)
{
boolean hasManageAccess = false;
@@ -353,7 +359,7 @@
/**
*
*/
- private boolean computeAccess(User user, String path, String action)
+ protected boolean computeAccess(User user, String path, String action)
{
boolean hasAccess = false;
Added: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/DummyCommand.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/DummyCommand.java (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/DummyCommand.java 2008-09-04 12:28:53 UTC (rev 11803)
@@ -0,0 +1,50 @@
+/******************************************************************************
+ * 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.cms.test.security;
+
+import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class DummyCommand extends JCRCommand
+{
+ public String path;
+
+ public DummyCommand(String path)
+ {
+ this.path = path;
+ }
+
+ @Override
+ public Object execute() throws CMSException
+ {
+ System.out.println(path);
+ return null;
+ }
+
+
+}
+
Added: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestACLEnforcer.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestACLEnforcer.java (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestACLEnforcer.java 2008-09-04 12:28:53 UTC (rev 11803)
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * 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.cms.test.security;
+
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+import org.jboss.portal.cms.impl.jcr.command.ACLEnforcer;
+import org.jboss.portal.cms.security.AuthorizationManager;
+import org.jboss.portal.identity.User;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class TestACLEnforcer extends ACLEnforcer
+{
+ public TestACLEnforcer(AuthorizationManager authorizationManager)
+ {
+ super(authorizationManager);
+ addACLCommand(Type.READ, DummyCommand.class.getName());
+ }
+
+ protected boolean hasReadAccess(User user, JCRCommand command)
+ {
+ boolean hasReadAccess = super.hasReadAccess(user, command);
+
+ String path = null;
+ if (command instanceof DummyCommand)
+ {
+ path = ((DummyCommand)command).path;
+ }
+
+ if (path != null)
+ {
+ hasReadAccess = this.hasReadAccess(user, path);
+ }
+
+ return hasReadAccess;
+ }
+}
+
Added: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestAuthorizationManagerImpl.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestAuthorizationManagerImpl.java (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestAuthorizationManagerImpl.java 2008-09-04 12:28:53 UTC (rev 11803)
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * 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.cms.test.security;
+
+import org.jboss.portal.cms.security.AuthorizationManagerImpl;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class TestAuthorizationManagerImpl extends AuthorizationManagerImpl
+{
+
+ public void startService() throws Exception
+ {
+ super.startService();
+ setEnforcer(new TestACLEnforcer(this));
+ }
+}
+
Added: 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 (rev 0)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/security/TestNewReadCommand.java 2008-09-04 12:28:53 UTC (rev 11803)
@@ -0,0 +1,197 @@
+/******************************************************************************
+ * 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.cms.test.security;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.naming.InitialContext;
+
+import junit.framework.TestSuite;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
+import org.jboss.portal.cms.impl.interceptors.ACLInterceptor;
+import org.jboss.portal.cms.impl.jcr.JCRCMS;
+import org.jboss.portal.cms.model.File;
+import org.jboss.portal.cms.model.Folder;
+import org.jboss.portal.cms.security.AuthorizationProviderImpl;
+import org.jboss.portal.common.invocation.Interceptor;
+import org.jboss.portal.identity.IdentityContext;
+import org.jboss.portal.identity.IdentityServiceController;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.server.impl.invocation.JBossInterceptorStack;
+import org.jboss.portal.cms.test.commands.AbstractCommandTestCase;
+import org.jboss.portal.cms.test.commands.CMSInterceptorStackFactory;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision$
+ */
+public class TestNewReadCommand extends AbstractCommandTestCase
+{
+ String rejectFolderPath = "/default/private";
+ String allowedFolderPath = "/default/images";
+ String rejectFilePath = "/default/private/license.html";
+ String allowedFilePath = "/default/images/check.gif";
+
+ /**
+ *
+ */
+ protected UserModule userModule = null;
+
+ /**
+ *
+ */
+ public TestNewReadCommand()
+ {
+ 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
+ {
+ ACLInterceptor aclInterceptor = (ACLInterceptor)new InitialContext().lookup("java:/portal/cms/ACLInterceptor");
+ return aclInterceptor;
+ }
+
+ /** @param username */
+ protected void runAs(String username) throws Exception
+ {
+ SessionFactory sessionFactory = (SessionFactory)new InitialContext().lookup("java:/SessionFactory");
+ Session session = sessionFactory.openSession();
+ Transaction tx = session.beginTransaction();
+ JCRCMS.getUserInfo().set(this.userModule.findUserByUserName(username));
+ tx.commit();
+ session.close();
+ }
+
+ /**
+ * @param folderPath
+ * @throws CMSException
+ */
+ private void runAccessScenario(String folderPath) throws CMSException
+ {
+ //Get the specified folder
+ Command command = new DummyCommand(folderPath);
+ this.service.execute(command);
+ }
+
+ /** @throws Exception */
+ public void testAnonymous() throws Exception
+ {
+ try
+ {
+ this.runAccessScenario(this.rejectFilePath);
+ assertTrue("Access should not have been granted to" + this.rejectFilePath,
+ false);
+ }
+ catch (CMSException cme)
+ {
+ // assert and make sure access was not granted
+ String cmeMessage = cme.toString();
+ assertTrue(cmeMessage.indexOf("Access to this resource is denied") != -1);
+ }
+
+ try
+ {
+ this.runAccessScenario(this.rejectFolderPath);
+ assertTrue("Access should not have been granted to" + this.rejectFolderPath,
+ false);
+ }
+ catch (CMSException cme)
+ {
+ // assert and make sure access was not granted
+ String cmeMessage = cme.toString();
+ assertTrue(cmeMessage.indexOf("Access to this resource is denied") != -1);
+ }
+
+ try
+ {
+ this.runAccessScenario(this.allowedFilePath);
+ }
+ catch (CMSException cme)
+ {
+ // assert and make sure access was not granted
+ String cmeMessage = cme.toString();
+ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1);
+ }
+
+ try
+ {
+ this.runAccessScenario(this.allowedFolderPath);
+ }
+ catch (CMSException cme)
+ {
+ // assert and make sure access was not granted
+ String cmeMessage = cme.toString();
+ assertTrue(cmeMessage.indexOf("Access to this resource is denied") == -1);
+ }
+ }
+}
+
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 11:29:22 UTC (rev 11802)
+++ modules/cms/trunk/cms-jackrabbit/src/test/resources/jboss-unit.xml 2008-09-04 12:28:53 UTC (rev 11803)
@@ -84,6 +84,9 @@
<test >
<class name="org.jboss.portal.cms.test.security.TestWriteAccess"/>
</test>
+ <test >
+ <class name="org.jboss.portal.cms.test.security.TestNewReadCommand"/>
+ </test>
</pojo>
<pojo>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11802 - in branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui: coordination and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-04 07:29:22 -0400 (Thu, 04 Sep 2008)
New Revision: 11802
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
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
Log:
Fixing persistence issue.
More issues to fix:
- renaming an alias fails
- deleting an alias fails
- there is probably places that requires a CoordinationManagerBean.refresh() call
(i've only tested aliases)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-09-03 22:56:23 UTC (rev 11801)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-09-04 11:29:22 UTC (rev 11802)
@@ -517,6 +517,7 @@
if (object != null)
{
selectObject(poid);
+ selectedObject = object;
//
switch (object.getType())
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-03 22:56:23 UTC (rev 11801)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-04 11:29:22 UTC (rev 11802)
@@ -144,6 +144,7 @@
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
}
+ managerBean.refresh();
return resetSelection();
}
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-03 22:56:23 UTC (rev 11801)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-04 11:29:22 UTC (rev 11802)
@@ -22,6 +22,15 @@
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;
@@ -38,13 +47,6 @@
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.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -53,57 +55,70 @@
{
private PortalObjectManagerBean pomb;
- private Page selectedPage;
+ private Map<String, CoordinationManagerBean.CoordinationBean> managers = new HashMap<String, CoordinationManagerBean.CoordinationBean>();
- private PortalObjectId selectedObjectId;
-
- private AliasBindingManagerBean aliasManager;
- private EventWiringManagerBean eventManager;
- private ParameterBindingManagerBean parameterManager;
-
// Handle selections for deletion and renaming
private static final String RESOURCE_NAME = "Resource";
private static final String SELECTED_NAME = "name";
private static final String SELECTED_TYPE = "type";
+
private String selectedName;
private CoordinationType selectedType;
- private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
- private static ThreadLocal<ParameterBindingManagerBean> parameterManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
- private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
private enum CoordinationType
{
wiring() {
+ private CoordinationBean bean;
+
String localizationKey()
{
return "COORDINATION_WIRING";
}
- CoordinationBean bean()
+ CoordinationBean getBean()
{
- return eventManagerHolder.get();
+ return bean;
+ }
+ void setBean(CoordinationBean bean)
+ {
+ this.bean = bean;
}},
parameter() {
+ private CoordinationBean bean;
+
String localizationKey()
{
return "COORDINATION_PARAMETER";
}
- CoordinationBean bean()
+ CoordinationBean getBean()
{
- return parameterManagerHolder.get();
+ return bean;
+ }
+ void setBean(CoordinationBean bean)
+ {
+ this.bean = bean;
}},
alias() {
+ private CoordinationBean bean;
+
String localizationKey()
{
return "COORDINATION_ALIAS";
- }CoordinationBean bean()
+ }
+ CoordinationBean getBean()
{
- return aliasManagerHolder.get();
+ return bean;
+ }
+ void setBean(CoordinationBean bean)
+ {
+ this.bean = bean;
}};
abstract String localizationKey();
- abstract CoordinationBean bean();
+ abstract CoordinationBean getBean();
+
+ abstract void setBean(CoordinationBean bean);
}
abstract static class CoordinationBean
@@ -147,45 +162,15 @@
}
}
- public PortalObjectId getSelectedObjectId()
- {
- //since this backing bean is in session, always check for new object request
- String id = getFacesParam("id");
- if (id != null)
- {
- selectedObjectId = parsePortalObjectId(id);
- }
- else
- {
- selectedObjectId = pomb.getSelectedObject().getId();
- }
- return selectedObjectId;
- }
-
- public void setSelectedObjectId(PortalObjectId selectedObjectId)
- {
- this.selectedObjectId = selectedObjectId;
- }
-
public Page getSelectedPage()
{
- // if we don't already have a selected page or we have selected a different object
- if (selectedPage == null || !selectedPage.getId().equals(selectedObjectId))
+ PortalObject portalObject = pomb.getSelectedObject();
+ if (portalObject.getType() != PortalObject.TYPE_PAGE)
{
- PortalObject portalObject = pomb.getPortalObjectContainer().getObject(getSelectedObjectId());
- if (portalObject.getType() != PortalObject.TYPE_PAGE)
- {
- throw new IllegalArgumentException("Coordination can only be dealt with at the page level!");
- }
-
- selectedPage = (Page)portalObject;
-
- //perform surgery on portalobjectmanager
- pomb.selectObject(selectedPage.getId());
- return selectedPage;
+ throw new IllegalArgumentException("Coordination can only be dealt with at the page level!");
}
- return selectedPage;
+ return (Page)portalObject;
}
public PortalObjectManagerBean getPomb()
@@ -215,35 +200,35 @@
public EventWiringManagerBean getEventManager()
{
- return eventManager;
+ return (EventWiringManagerBean)managers.get(CoordinationType.wiring.name());
}
public void setEventManager(EventWiringManagerBean eventManager)
{
- this.eventManager = eventManager;
- this.eventManager.setManagerBean(this);
+ eventManager.setManagerBean(this);
+ this.managers.put(CoordinationType.wiring.name(), eventManager);
}
public ParameterBindingManagerBean getParameterManager()
{
- return parameterManager;
+ return (ParameterBindingManagerBean)managers.get(CoordinationType.parameter.name());
}
public void setParameterManager(ParameterBindingManagerBean parameterManager)
{
- this.parameterManager = parameterManager;
- this.parameterManager.setManagerBean(this);
+ parameterManager.setManagerBean(this);
+ this.managers.put(CoordinationType.parameter.name(), parameterManager);
}
public AliasBindingManagerBean getAliasManager()
{
- return aliasManager;
+ return (AliasBindingManagerBean)managers.get(CoordinationType.alias.name());
}
public void setAliasManager(AliasBindingManagerBean aliasManager)
{
- this.aliasManager = aliasManager;
- this.aliasManager.setManagerBean(this);
+ aliasManager.setManagerBean(this);
+ this.managers.put(CoordinationType.alias.name(), aliasManager);
}
public boolean isExplicitEventsUsed()
@@ -300,49 +285,57 @@
{
try
{
- // make sure we use the proper selected page
- selectedObjectId = pomb.getSelectedPortalObjectId();
-
// 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
- aliasManager = replaceInSession("aliasManager", new AliasBindingManagerBean(this));
- aliasManagerHolder.set(aliasManager);
- eventManager = replaceInSession("eventManager", new EventWiringManagerBean(this));
- eventManagerHolder.set(eventManager);
- parameterManager = replaceInSession("parameterManager", new ParameterBindingManagerBean(this));
- parameterManagerHolder.set(parameterManager);
+ 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)));
- // Extract metadata only on window children and only if needed
- if (isExplicitEventsUsed() || isExplicitParametersUsed())
+ Page selectedPage = getSelectedPage();
+
+ if (isExplicitEventsUsed())
{
+ managers.get(CoordinationType.wiring.name()).loadInfoFrom(selectedPage);
+ }
+ if (isExplicitParametersUsed())
+ {
+ managers.get(CoordinationType.parameter.name()).loadInfoFrom(selectedPage);
+ }
+ managers.get(CoordinationType.alias.name()).loadInfoFrom(selectedPage);
- eventManager.loadInfoFrom(selectedPage);
- parameterManager.loadInfoFrom(selectedPage);
- aliasManager.loadInfoFrom(selectedPage);
+ Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
+ if (!children.isEmpty())
+ {
+ if (isExplicitParametersUsed())
+ {
+ ((ParameterBindingManagerBean)managers.get(CoordinationType.parameter.name())).initKnowing(children);
+ }
+ ((AliasBindingManagerBean)managers.get(CoordinationType.alias.name())).initKnowing(children);
- Collection<PortalObject> children = selectedPage.getChildren(PortalObject.WINDOW_MASK);
- if (!children.isEmpty())
+ for (PortalObject po : children)
{
- parameterManager.initKnowing(children);
- aliasManager.initKnowing(children);
-
- for (PortalObject po : children)
+ Window window = (Window)po;
+ if (ContentType.PORTLET.equals(window.getContentType()))
{
- Window window = (Window)po;
- if (ContentType.PORTLET.equals(window.getContentType()))
+ PortletContent pc = (PortletContent)window.getContent();
+ Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef());
+ if (instance != null)
{
- PortletContent pc = (PortletContent)window.getContent();
- Instance instance = pomb.getInstanceContainer().getDefinition(pc.getInstanceRef());
PortletInfo info = instance.getPortlet().getInfo();
- parameterManager.extractInfoFrom(window, info);
- eventManager.extractInfoFrom(window, info);
- aliasManager.extractInfoFrom(window, info);
+ if (isExplicitParametersUsed())
+ {
+ managers.get(CoordinationType.parameter.name()).extractInfoFrom(window, info);
+ }
+ if (isExplicitEventsUsed())
+ {
+ managers.get(CoordinationType.wiring.name()).extractInfoFrom(window, info);
+ }
+ managers.get(CoordinationType.alias.name()).extractInfoFrom(window, info);
}
}
}
}
-
}
catch (Exception e)
{
@@ -448,11 +441,19 @@
{
selectedName = getFacesParam(SELECTED_NAME);
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()
@@ -469,11 +470,12 @@
public String deleteSelected(ActionEvent actionEvent)
{
+ select(actionEvent);
if (selectedType != null)
{
try
{
- selectedType.bean().delete(selectedName);
+ selectedType.getBean().delete(selectedName);
refresh();
}
catch (IllegalCoordinationException e)
@@ -491,10 +493,10 @@
/**
* Refreshes the page data.
*/
- private void refresh()
+ public void refresh()
{
// need to make sure that POMB has a selection...
- pomb.selectObject(selectedObjectId);
+// pomb.selectObject(selectedObjectId);
editCoordination();
}
@@ -512,7 +514,7 @@
{
if (selectedType != null)
{
- selectedType.bean().rename(selectedName, newName);
+ selectedType.getBean().rename(selectedName, newName);
refresh();
}
@@ -520,6 +522,6 @@
selectedType = null;
selectedName = null;
newName = null;
- return EDIT_COORDINATION;
+ return ""; //EDIT_COORDINATION;
}
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11801 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-03 18:56:23 -0400 (Wed, 03 Sep 2008)
New Revision: 11801
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
[JBPORTAL-2149] missed this one
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-03 22:47:57 UTC (rev 11800)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-09-03 22:56:23 UTC (rev 11801)
@@ -121,10 +121,12 @@
<componentref name="portals-bridges" version="1.0.3"/>
<componentref name="tagsoup" version="1.2"/>
-
<!-- For the presentation branch only, not the mainstream branch -->
<componentref name="gwt" version="1.4.60"/>
<componentref name="mygwt" version="0.3.0"/>
+
+ <!-- To use new jboss-cahce/hibernate integration library-->
+ <componentref name="org/jboss/cluster/hibernate-jbc-cacheprovider" version="1.0.0.GA"/>
</build>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11800 - in branches/JBoss_Portal_Branch_2_6/core: src/resources/portal-core-sar/META-INF and 4 other directories.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-09-03 18:47:57 -0400 (Wed, 03 Sep 2008)
New Revision: 11800
Modified:
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
Log:
[JBPORTAL-2149] integrate new jboss cache and hibernate library into portal
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -379,6 +379,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_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -526,9 +526,9 @@
</attribute>
- <attribute name="NodeLockingScheme">PESSIMISTIC</attribute>
- <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
- <attribute name="CacheMode">REPL_ASYNC</attribute>
+ <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="IsolationLevel">READ_COMMITTED</attribute>
+ <attribute name="CacheMode">INVALIDATION_SYNC</attribute>
<attribute name="ClusterName">
${portal.hibernate.cache.partition.name:portal.hibernate}
@@ -598,13 +598,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@
-->
@@ -615,10 +609,7 @@
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>
@@ -631,10 +622,6 @@
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>
@@ -646,9 +633,6 @@
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>
@@ -659,10 +643,7 @@
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_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -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_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -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_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -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_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -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_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-03 22:47:47 UTC (rev 11799)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml 2008-09-03 22:47:57 UTC (rev 11800)
@@ -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, 10 months
- 1
- 0
JBoss Portal SVN: r11799 - in branches/JBoss_Portal_Branch_2_7: build and 7 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-03 18:47:47 -0400 (Wed, 03 Sep 2008)
New Revision: 11799
Removed:
branches/JBoss_Portal_Branch_2_7/cms/
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/build/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/search/build.xml
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java
Log:
integrating with the new cms module based on upgraded jackrabbit-1.4
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -46,9 +46,10 @@
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/cms" version="trunk-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
- <componentref name="jackrabbit" version="1.1.1"/>
+ <componentref name="jackrabbit" version="1.4"/>
<componentref name="apache-beanutils" version="1.7.0"/>
<componentref name="apache-codec" version="1.3.0"/>
<componentref name="apache-collections" version="3.1"/>
@@ -57,8 +58,8 @@
<componentref name="apache-httpclient" version="3.0.1"/>
<componentref name="apache-lang" version="2.1"/>
<componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
- <componentref name="apache-lucene" version="1.4.3"/>
+ <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
+ <componentref name="apache-lucene" version="2.2.0"/>
<componentref name="apache-net" version="1.4.1"/>
<componentref name="apache-xerces" version="2.7.1"/>
<componentref name="asm" version="1.5.3"/>
@@ -101,7 +102,7 @@
<componentref name="qdox" version="1.4"/>
<componentref name="trove" version="1.0.2"/>
<componentref name="sleepycat" version="3.0.12"/>
- <componentref name="slf4j" version="1.0.2"/>
+ <componentref name="slf4j" version="1.3.0"/>
<componentref name="stax-api" version="1.0"/>
<componentref name="sun-jaf" version="1.1"/>
<componentref name="sun-javacc" version="3.2-portal"/>
@@ -118,7 +119,7 @@
<componentref name="tagsoup" version="1.2"/>
<componentref name="portlet" version="2.0-Draft32"/>
<componentref name="sun-jstl" version="1.2"/>
- <componentref name="jboss/web" version="2.1.0.GA"/>
+ <componentref name="jboss/web" version="2.1.0.GA"/>
</build>
<synchronizeinfo/>
Modified: branches/JBoss_Portal_Branch_2_7/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/build/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -117,8 +117,7 @@
<module name="api"/>
<module name="server"/>
<module name="portlet-server"/>
- <module name="theme"/>
- <module name="cms"/>
+ <module name="theme"/>
<module name="core"/>
<module name="core-cms"/>
<module name="core-management"/>
@@ -138,13 +137,9 @@
<group name="portal">
<include
- modules="api, jems, server, security, search, portlet-server, faces, theme, workflow, registration, core, cms, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/>
+ modules="api, jems, server, security, search, portlet-server, faces, theme, workflow, registration, core, wsrp, core-admin, core-management, core-identity, core-cms, core-samples, widget"/>
</group>
- <group name="cms">
- <include modules="jems, workflow, cms"/>
- </group>
-
<group name="security">
<include modules="jems, security"/>
</group>
@@ -370,10 +365,7 @@
</packageset>
<packageset dir="../theme/src/main">
<exclude name="org/jboss/portal/test/**"/>
- </packageset>
- <packageset dir="../cms/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
+ </packageset>
<packageset dir="../core/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -119,12 +119,13 @@
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
<path refid="jbpm.jpdl.classpath"/>
+ <!-- cms module -->
+ <path refid="jboss.portal/modules/cms.classpath"/>
</path>
<!-- Configure modules -->
<call target="configure-modules"/>
- <path id="dependentmodule.classpath">
- <path refid="jboss.portal-cms.classpath"/>
+ <path id="dependentmodule.classpath">
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
@@ -248,23 +249,25 @@
<fileset dir="${build.resources}/portal-cms-sar"/>
</copy>
<copy todir="${build.resources}/portal-cms/lib">
+ <!-- portal cms -->
<fileset dir="${build.lib}" includes="portal-core-cms-lib.jar"/>
- <fileset dir="${jboss.portal-cms.root}/lib" includes="portal-cms-lib.jar"/>
- <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
- <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
- <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
- <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+ <fileset dir="${jboss.portal/modules/cms.lib}" includes="cms-jackrabbit-trunk-SNAPSHOT.jar"/>
+
+ <!-- jcr/jackrabbit integration -->
+ <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
+ <fileset dir="${jackrabbit.jackrabbit.lib}"/>
<!-- cms indexing integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/>
-
- <!-- cms optimization integration - this contains a clustered cache enabled version -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
<fileset dir="${jboss.cache.lib}" includes="jboss-cache-jdk50.jar"/>
- <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+
+ <!-- miscellaneous thirdparty dep -->
+ <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
+ <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+ <fileset dir="${slf4j.slf4j.lib}"/>
</copy>
<!-- portal-cms.war -->
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-sar/META-INF/jboss-service.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -128,18 +128,18 @@
<!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
- <param name="path" value="${wsp.home}/index"/>
- <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/>
- <param name="useCompoundFile" value="true"/>
- <param name="minMergeDocs" value="100"/>
- <param name="volatileIdleTime" value="3"/>
- <param name="maxMergeDocs" value="100000"/>
- <param name="mergeFactor" value="10"/>
- <param name="bufferSize" value="10"/>
- <param name="cacheSize" value="1000"/>
- <param name="forceConsistencyCheck" value="false"/>
- <param name="autoRepair" value="true"/>
- </SearchIndex>
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.HTMLTextExtractor"/>
+ <param name="useCompoundFile" value="true"/>
+ <param name="minMergeDocs" value="100"/>
+ <param name="volatileIdleTime" value="3"/>
+ <param name="maxMergeDocs" value="100000"/>
+ <param name="mergeFactor" value="10"/>
+ <param name="bufferSize" value="10"/>
+ <param name="cacheSize" value="1000"/>
+ <param name="forceConsistencyCheck" value="false"/>
+ <param name="autoRepair" value="true"/>
+ </SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<!--
Modified: branches/JBoss_Portal_Branch_2_7/search/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/build.xml 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/build.xml 2008-09-03 22:47:47 UTC (rev 11799)
@@ -175,14 +175,14 @@
<target name="most" depends="_default:most"/>
<target name="help" depends="_default:help"/>
- <target name="tests" depends="init">
+ <target name="tests" depends="compile">
<execute-tests>
<x-test>
- <test todir="${test.reports}" name="org.jboss.portal.search.test.LuceneQueryTest"/>
+ <test todir="${test.reports}" name="org.jboss.portal.search.test.ConverterTest"/>
<test todir="${test.reports}" name="org.jboss.portal.search.test.FederationTest"/>
</x-test>
<x-classpath>
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/FederatedQuery.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -49,7 +49,8 @@
{
try
{
- luceneQuery = QueryParser.parse(queryString, "all", new StandardAnalyzer());
+ QueryParser queryParser = new QueryParser("all" , new StandardAnalyzer());
+ luceneQuery = queryParser.parse(queryString);
}
catch (ParseException e)
{
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/SimpleQueryConverter.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -56,7 +56,7 @@
org.apache.lucene.search.BooleanClause luceneClause = luceneClauses[i];
try
{
- clauses.add(new BooleanClause((SimpleQuery)convert(luceneClause.query), luceneClause.required, luceneClause.prohibited));
+ clauses.add(new BooleanClause((SimpleQuery)convert(luceneClause.getQuery()), luceneClause.isRequired(), luceneClause.isProhibited()));
}
catch (QueryConversionException e)
{
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -77,9 +77,9 @@
{
result.append(", ");
}
- if (!clause.prohibited)
+ if (!clause.isProhibited())
{
- result.append(((JCRQuery)convert(clause.query)).getJcrQuery());
+ result.append(((JCRQuery)convert(clause.getQuery())).getJcrQuery());
first = false;
}
}
Modified: branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java 2008-09-03 20:53:39 UTC (rev 11798)
+++ branches/JBoss_Portal_Branch_2_7/search/src/main/org/jboss/portal/search/impl/lucene/LuceneFederatedIndexer.java 2008-09-03 22:47:47 UTC (rev 11799)
@@ -92,11 +92,11 @@
Document doc = new Document();
if (genericDoc.getTitle() != null)
{
- doc.add(Field.Text("title", genericDoc.getTitle()));
+ doc.add(new Field("title", genericDoc.getTitle(), Field.Store.YES, Field.Index.TOKENIZED));
}
if (genericDoc.getDate() != 0)
{
- doc.add(Field.Text("date", genericDoc.getDate() + ""));
+ doc.add(new Field("date", genericDoc.getDate() + "", Field.Store.YES, Field.Index.TOKENIZED));
}
if (genericDoc.getFields() != null)
{
@@ -105,7 +105,7 @@
while (itKeys.hasNext())
{
String key = (String)itKeys.next();
- doc.add(Field.Text(key, (String)map.get(key)));
+ doc.add(new Field(key, (String)map.get(key), Field.Store.YES, Field.Index.TOKENIZED));
}
}
documents.add(doc);
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11798 - in modules/cms/trunk: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-09-03 16:53:39 -0400 (Wed, 03 Sep 2008)
New Revision: 11798
Modified:
modules/cms/trunk/.classpath
modules/cms/trunk/build/pom.xml
modules/cms/trunk/cms-jackrabbit/pom.xml
modules/cms/trunk/pom.xml
Log:
changing snapshot name to trunk-SNAPSHOT (clearer)
Modified: modules/cms/trunk/.classpath
===================================================================
--- modules/cms/trunk/.classpath 2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/.classpath 2008-09-03 20:53:39 UTC (rev 11798)
@@ -1,10 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="cms-jackrabbit/target/classes" path="cms-jackrabbit/src/main/java"/>
- <classpathentry kind="src" output="cms-jackrabbit/target/test-classes" path="cms-jackrabbit/src/test/java"/>
- <classpathentry excluding="**" kind="src" output="cms-jackrabbit/target/classes" path="cms-jackrabbit/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="cms-jackrabbit/target/test-classes" path="cms-jackrabbit/src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="cms-jackrabbit/src/main/java"/>
+ <classpathentry kind="src" path="cms-jackrabbit/src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="cms-jackrabbit/src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="cms-jackrabbit/src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant-nodeps/1.6.5/ant-nodeps-1.6.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/bsh/bsh/1.3.0/bsh-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/cargo/cargo-core-uberjar/0.8/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/common/common-common/1.2.0/common-common-1.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cargo/core/0.9-portal/core-0.9-portal.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.4.1/ehcache-1.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hibernate/hibernate3/3.2.4.SP1/hibernate3-3.2.4.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/portal/identity/identity-identity/1.0.2/identity-identity-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss/4.2.2.GA/jboss-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss/4.0.4.GA/jboss-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR1/jboss-aop-2.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-common-jdbc-wrapper/4.0.4.GA/jboss-common-jdbc-wrapper-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-container/2.0.0.Beta9/jboss-container-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.0.Beta9/jboss-dependency-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-j2ee/4.2.0.GA/jboss-j2ee-4.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-jca/4.0.4.GA/jboss-jca-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-jmx/4.2.0.GA/jboss-jmx-4.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.0.Beta9/jboss-kernel-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-local-jdbc/4.2.2.GA/jboss-local-jdbc-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-jdk/2.0.2.GA/jboss-logging-jdk-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-managed/2.0.0.Beta9/jboss-managed-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-metatype/2.0.0.Beta9/jboss-metatype-2.0.0.Beta9.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-system/4.2.2.GA/jboss-system-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jboss-transaction/4.0.4.GA/jboss-transaction-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit/1.2.0.Beta2/jboss-unit-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-mc/1.2.0.Beta2/jboss-unit-mc-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-ant/1.2.0.Beta2/jboss-unit-tooling-ant-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/jboss-unit-tooling-core/1.2.0.Beta2/jboss-unit-tooling-core-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/1.4.1.SP3/jbosscache-core-1.4.1.SP3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossha/4.2.2.GA/jbossha-4.2.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR4/jbossxb-2.0.0.CR4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jbpm/jbpm-jpdl/3.2.2/jbpm-jpdl-3.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.3.0/jcl104-over-slf4j-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sleepycat/je/3.0.12/je-3.0.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.4.1/jgroups-2.4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossas/core-libs/jnpserver/4.0.4.GA/jnpserver-4.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/jsr107cache/jsr107cache/1.0/jsr107cache-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/nekohtml/nekohtml/0.9.4/nekohtml-0.9.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-opends/opends-core/legacy/opends-core-legacy.jar"/>
+ <classpathentry kind="var" path="M2_REPO/pdfbox/pdfbox/0.6.4/pdfbox-0.6.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/poi/poi/2.5.1-final-20040804/poi-2.5.1-final-20040804.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-core-lib/2.7/portal-core-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-jems-lib/2.7/portal-jems-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-search-lib/2.7/portal-search-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-security-lib/2.7/portal-security-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-server-lib/2.7/portal-server-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/unit/portal-test/1.2.0.Beta2/portal-test-1.2.0.Beta2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/local/portal-workflow-lib/2.7/portal-workflow-lib-2.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/textmining/tm-extractors/0.4/tm-extractors-0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+</classpath>
\ No newline at end of file
Modified: modules/cms/trunk/build/pom.xml
===================================================================
--- modules/cms/trunk/build/pom.xml 2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/build/pom.xml 2008-09-03 20:53:39 UTC (rev 11798)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal CMS</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -27,8 +27,7 @@
<properties>
<version.junit>3.8.2</version.junit>
<version.log4j>1.2.14</version.log4j>
- <version.slf4j.api>1.3.0</version.slf4j.api>
- <version.slf4j.simple>1.3.0</version.slf4j.simple>
+ <version.slf4j>1.3.0</version.slf4j>
<version.jboss.cache>1.4.1.SP3</version.jboss.cache>
<version.jgroups>2.4.1</version.jgroups>
<version.jboss.hibernate>3.2.4.SP1</version.jboss.hibernate>
@@ -158,14 +157,19 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${version.slf4j.api}</version>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${version.slf4j.simple}</version>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ <version>${version.slf4j}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<version>${version.jboss.cache}</version>
Modified: modules/cms/trunk/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/cms-jackrabbit/pom.xml 2008-09-03 20:53:39 UTC (rev 11798)
@@ -5,7 +5,7 @@
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-jackrabbit</artifactId>
@@ -30,18 +30,56 @@
<artifactId>jackrabbit-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
- </dependency>
+ <groupId>org.jboss.cache</groupId>
+ <artifactId>jbosscache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.portal.identity</groupId>
+ <artifactId>identity-identity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl104-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-jdk</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </dependency>
+
+ <!-- local dependencies -->
<dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </dependency>
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -64,16 +102,8 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- </dependency>
+ </dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: modules/cms/trunk/pom.xml
===================================================================
--- modules/cms/trunk/pom.xml 2008-09-03 13:53:17 UTC (rev 11797)
+++ modules/cms/trunk/pom.xml 2008-09-03 20:53:39 UTC (rev 11798)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal CMS Module</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>trunk-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11797 - 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-03 09:53:17 -0400 (Wed, 03 Sep 2008)
New Revision: 11797
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java
Log:
- Update the holders when managers are re-created to avoid NPE.
- Renamed windowManagerHolder to parameterManagerHolder to be in sync with previous renames.
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-03 12:16:13 UTC (rev 11796)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/CoordinationManagerBean.java 2008-09-03 13:53:17 UTC (rev 11797)
@@ -68,7 +68,7 @@
private String selectedName;
private CoordinationType selectedType;
private static ThreadLocal<EventWiringManagerBean> eventManagerHolder = new ThreadLocal<EventWiringManagerBean>();
- private static ThreadLocal<ParameterBindingManagerBean> windowManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
+ private static ThreadLocal<ParameterBindingManagerBean> parameterManagerHolder = new ThreadLocal<ParameterBindingManagerBean>();
private static ThreadLocal<AliasBindingManagerBean> aliasManagerHolder = new ThreadLocal<AliasBindingManagerBean>();
private String newName;
static final String EDIT_COORDINATION = "editCoordination";
@@ -91,7 +91,7 @@
}
CoordinationBean bean()
{
- return windowManagerHolder.get();
+ return parameterManagerHolder.get();
}},
alias() {
String localizationKey()
@@ -304,10 +304,13 @@
selectedObjectId = pomb.getSelectedPortalObjectId();
// reset the different managers as they are in session scope but need to be re-initialized each time a new
- // page is reloaded
+ // page is reloaded, also need to update the holders for the different managers
aliasManager = replaceInSession("aliasManager", new AliasBindingManagerBean(this));
+ aliasManagerHolder.set(aliasManager);
eventManager = replaceInSession("eventManager", new EventWiringManagerBean(this));
+ eventManagerHolder.set(eventManager);
parameterManager = replaceInSession("parameterManager", new ParameterBindingManagerBean(this));
+ parameterManagerHolder.set(parameterManager);
// Extract metadata only on window children and only if needed
if (isExplicitEventsUsed() || isExplicitParametersUsed())
@@ -448,7 +451,7 @@
// make manager accessible to CoordinationType
eventManagerHolder.set(eventManager);
- windowManagerHolder.set(parameterManager);
+ parameterManagerHolder.set(parameterManager);
aliasManagerHolder.set(aliasManager);
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11796 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-09-03 08:16:13 -0400 (Wed, 03 Sep 2008)
New Revision: 11796
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/resources/portal-admin-war/jsf/editCoordination.xhtml
Log:
- Can now select several parameters to create a new alias.
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-03 12:15:06 UTC (rev 11795)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/coordination/AliasBindingManagerBean.java 2008-09-03 12:16:13 UTC (rev 11796)
@@ -52,7 +52,7 @@
private Set<QNameSelectItem> availableRenderParameters;
private String aliasName;
- private String originalQName;
+ private List<String> originalQNames;
public AliasBindingManagerBean()
{
@@ -73,14 +73,14 @@
this.aliasName = aliasName;
}
- public String getOriginalQName()
+ public List<String> getOriginalQNames()
{
- return originalQName;
+ return originalQNames;
}
- public void setOriginalQName(String originalQName)
+ public void setOriginalQNames(List<String> originalQNames)
{
- this.originalQName = originalQName;
+ this.originalQNames = originalQNames;
}
public void loadInfoFrom(Page page)
@@ -133,7 +133,10 @@
try
{
HashSet<QName> qNames = new HashSet<QName>();
- qNames.add(QName.valueOf(originalQName));
+ for (String qName : originalQNames)
+ {
+ qNames.add(QName.valueOf(qName));
+ }
managerBean.getCoordinationService().setAliasBinding(managerBean.getSelectedPage(), aliasName, qNames);
}
catch (IllegalCoordinationException e)
@@ -147,7 +150,7 @@
public String resetSelection()
{
aliasName = null;
- originalQName = null;
+ originalQNames = null;
return CoordinationManagerBean.EDIT_COORDINATION;
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-03 12:15:06 UTC (rev 11795)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2008-09-03 12:16:13 UTC (rev 11796)
@@ -18,13 +18,13 @@
<h:form rendered="#{!empty aliasManager.availableRenderParameters}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP1}
- <h:selectOneListbox id="alias" size="5" value="#{aliasManager.originalQName}"
+ <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}"
immediate="true" onchange="this.form.submit()">
<f:selectItems value="#{aliasManager.availableRenderParameters}"/>
- </h:selectOneListbox>
+ </h:selectManyListbox>
</div>
- <h:panelGroup rendered="#{!empty aliasManager.originalQName}">
+ <h:panelGroup rendered="#{!empty aliasManager.originalQNames}">
<div class="float-left quarter-width">
#{bundle.COORDINATION_ALIAS_CREATE_STEP2}
<h:inputText id="aliasName" value="#{aliasManager.aliasName}"/>
17 years, 10 months
- 1
- 0