JBoss Portal SVN: r11137 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 14:39:53 -0400 (Tue, 24 Jun 2008)
New Revision: 11137
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
Use snapshot of test branch 1.0 for now (so that we can get compatible version of common).
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 18:29:49 UTC (rev 11136)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 18:39:53 UTC (rev 11137)
@@ -43,7 +43,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.0"/>
<componentref name="jboss-portal/modules/web" version="1.2.0"/>
- <componentref name="jboss-portal/modules/test" version="1.0.1"/>
+ <componentref name="jboss-portal/modules/test" version="1.0-SNAPSHOT"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11136 - branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 14:29:49 -0400 (Tue, 24 Jun 2008)
New Revision: 11136
Modified:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
Log:
- mediaType can be null...
Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-06-24 16:23:28 UTC (rev 11135)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java 2008-06-24 18:29:49 UTC (rev 11136)
@@ -24,6 +24,7 @@
import org.jboss.portal.common.invocation.AbstractInvocationContext;
import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver;
+import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.common.text.CharBuffer;
import org.jboss.portal.common.text.FastURLEncoder;
import org.jboss.portal.common.util.ParameterMap;
@@ -34,8 +35,8 @@
import org.jboss.portal.server.impl.invocation.SessionAttributeResolver;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.web.Body;
import org.jboss.portal.web.WebRequest;
-import org.jboss.portal.web.Body;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -153,7 +154,12 @@
public String getMediaType()
{
- return webReq.getMediaType().getValue();
+ MediaType mediaType = webReq.getMediaType();
+ if(mediaType == null)
+ {
+ return null;
+ }
+ return mediaType.getValue();
}
public URLContext getURLContext()
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11135 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 12:23:28 -0400 (Tue, 24 Jun 2008)
New Revision: 11135
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
Log:
- Generification
- Some re-formatting
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 16:20:49 UTC (rev 11134)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 16:23:28 UTC (rev 11135)
@@ -16,32 +16,38 @@
<%
String sConfirm = renderRequest.getParameter("confirm");
String sCurrPath = (String)request.getAttribute("currpath");
- List folders = (List)request.getAttribute("folders");
- List files = (List)request.getAttribute("files");
+ List<Folder> folders = (List<Folder>)request.getAttribute("folders");
+ List<File> files = (List<File>)request.getAttribute("files");
String createDate = "";
String modifiedDate = "";
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
- List messages = (List)request.getAttribute("messages");
+ List<String> messages = (List<String>)request.getAttribute("messages");
%>
<div class="admin-ui">
<br/>
+
<h3 class="sectionTitle-blue">
${n:i18n("CMS_MANAGE")}
</h3>
+
<div class="cms-tab-container">
<!-- Displaying any messages that may have occurred during this request -->
-<%if(messages != null && !messages.isEmpty()){%>
+<%
+ if (messages != null && !messages.isEmpty())
+ {
+%>
<table width="100%">
<th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th>
- <%for(int i=0; i<messages.size(); i++){%>
- <tr colspan="2" align="center">
+ <%
+ for (String message : messages)
+ {
+ %>
+ <tr align="center">
<td colspan="2">
- <font color="red">
- <%=(String)messages.get(i)%>
- </font>
+ <font color="red"><%=message%></font>
</td>
</tr>
<%}%>
@@ -92,15 +98,16 @@
<br/>
<!-- folder-level action dropdown -->
<div class="menu-container">
-<%
- if (sConfirm != null && !"".equals(sConfirm))
- {
-%>
- <div class="portlet-msg-success"><%= sConfirm %></div>
+ <%
+ if (sConfirm != null && !"".equals(sConfirm))
+ {
+ %>
+ <div class="portlet-msg-success"><%= sConfirm %>
+ </div>
<br/>
-<%
- }
-%>
+ <%
+ }
+ %>
<div class="menu">
@@ -132,7 +139,7 @@
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
</portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
<%
- if (manageWorkflowAccessible.booleanValue())
+ if (manageWorkflowAccessible)
{
%>
<option value="<portlet:renderURL>
@@ -200,15 +207,14 @@
<%
if (folders.size() > 0)
{
- for (int i = 0; i < folders.size(); i++)
+ for (Folder folder : folders)
{
- Folder folder = (Folder)folders.get(i);
%>
<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
<td><img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
- alt="${n:i18n("CMS_FOLDER")}"
- border="0"> <a href="<portlet:renderURL>
+ src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
+ alt="${n:i18n("CMS_FOLDER")}"
+ border="0"> <a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= folder.getBasePath() %>"/>
</portlet:renderURL>"><%=
@@ -261,9 +267,8 @@
<%
if (files.size() > 0)
{
- for (int j = 0; j < files.size(); j++)
+ for (File file : files)
{
- File file = (File)files.get(j);
%>
<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
<td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11134 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 12:20:49 -0400 (Tue, 24 Jun 2008)
New Revision: 11134
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
Log:
- Generification
- Some re-formatting
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 15:55:55 UTC (rev 11133)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 16:20:49 UTC (rev 11134)
@@ -16,32 +16,38 @@
<%
String sConfirm = renderRequest.getParameter("confirm");
String sCurrPath = (String)request.getAttribute("currpath");
- List folders = (List)request.getAttribute("folders");
- List files = (List)request.getAttribute("files");
+ List<Folder> folders = (List<Folder>)request.getAttribute("folders");
+ List<File> files = (List<File>)request.getAttribute("files");
String createDate = "";
String modifiedDate = "";
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
- List messages = (List)request.getAttribute("messages");
+ List<String> messages = (List<String>)request.getAttribute("messages");
%>
<div class="admin-ui">
<br/>
+
<h3 class="sectionTitle-blue">
${n:i18n("CMS_MANAGE")}
</h3>
+
<div class="cms-tab-container">
<!-- Displaying any messages that may have occurred during this request -->
-<%if(messages != null && !messages.isEmpty()){%>
+<%
+ if (messages != null && !messages.isEmpty())
+ {
+%>
<table width="100%">
<th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th>
- <%for(int i=0; i<messages.size(); i++){%>
- <tr colspan="2" align="center">
+ <%
+ for (String message : messages)
+ {
+ %>
+ <tr align="center">
<td colspan="2">
- <font color="red">
- <%=(String)messages.get(i)%>
- </font>
+ <font color="red"><%=message%></font>
</td>
</tr>
<%}%>
@@ -92,15 +98,16 @@
<br/>
<!-- folder-level action dropdown -->
<div class="menu-container">
-<%
- if (sConfirm != null && !"".equals(sConfirm))
- {
-%>
- <div class="portlet-msg-success"><%= sConfirm %></div>
+ <%
+ if (sConfirm != null && !"".equals(sConfirm))
+ {
+ %>
+ <div class="portlet-msg-success"><%= sConfirm %>
+ </div>
<br/>
-<%
- }
-%>
+ <%
+ }
+ %>
<div class="menu">
@@ -132,7 +139,7 @@
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
</portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
<%
- if (manageWorkflowAccessible.booleanValue())
+ if (manageWorkflowAccessible)
{
%>
<option value="<portlet:renderURL>
@@ -200,15 +207,14 @@
<%
if (folders.size() > 0)
{
- for (int i = 0; i < folders.size(); i++)
+ for (Folder folder : folders)
{
- Folder folder = (Folder)folders.get(i);
%>
<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
<td><img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
- alt="${n:i18n("CMS_FOLDER")}"
- border="0"> <a href="<portlet:renderURL>
+ src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/folder.gif"
+ alt="${n:i18n("CMS_FOLDER")}"
+ border="0"> <a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= folder.getBasePath() %>"/>
</portlet:renderURL>"><%=
@@ -261,9 +267,8 @@
<%
if (files.size() > 0)
{
- for (int j = 0; j < files.size(); j++)
+ for (File file : files)
{
- File file = (File)files.get(j);
%>
<tr onmouseover="this.className='portlet-section-alternate';" onmouseout="this.className='portlet-section-body';">
<td><img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/file.gif"
@@ -337,4 +342,4 @@
%>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11133 - in branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-24 11:55:55 -0400 (Tue, 24 Jun 2008)
New Revision: 11133
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
Log:
- Fixing portential issue with Safari
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2008-06-24 15:53:43 UTC (rev 11132)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2008-06-24 15:55:55 UTC (rev 11133)
@@ -33,6 +33,11 @@
</transaction>
<header-content>
<link rel="stylesheet" type="text/css" href="/images/cms/admin/style.css" media="screen"/>
+ <script type="text/javascript">
+ function trim(stringToTrim) {
+ return stringToTrim.replace(/^\s+|\s+$/g,"");
+ }
+ </script>
</header-content>
<portlet-info>
<icon>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 15:53:43 UTC (rev 11132)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 15:55:55 UTC (rev 11133)
@@ -104,7 +104,7 @@
<div class="menu">
- <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <select onchange="window.open(trim(this.options[this.selectedIndex].value),'_top')">
<option value="">${n:i18n("CMS_SELECT_ACTION")}</option>
<option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11132 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-24 11:53:43 -0400 (Tue, 24 Jun 2008)
New Revision: 11132
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
Log:
- Fixing issue with Safari
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2008-06-24 14:55:06 UTC (rev 11131)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jboss-portlet.xml 2008-06-24 15:53:43 UTC (rev 11132)
@@ -33,6 +33,11 @@
</transaction>
<header-content>
<link rel="stylesheet" type="text/css" href="/images/cms/admin/style.css" media="screen"/>
+ <script type="text/javascript">
+ function trim(stringToTrim) {
+ return stringToTrim.replace(/^\s+|\s+$/g,"");
+ }
+ </script>
</header-content>
<portlet-info>
<icon>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 14:55:06 UTC (rev 11131)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-06-24 15:53:43 UTC (rev 11132)
@@ -104,7 +104,7 @@
<div class="menu">
- <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <select onchange="window.open(trim(this.options[this.selectedIndex].value),'_top')">
<option value="">${n:i18n("CMS_SELECT_ACTION")}</option>
<option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11131 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-24 10:55:06 -0400 (Tue, 24 Jun 2008)
New Revision: 11131
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
Log:
- Fix window states and portlet modes
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-06-24 14:25:12 UTC (rev 11130)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-06-24 14:55:06 UTC (rev 11131)
@@ -25,6 +25,7 @@
import org.jboss.logging.Logger;
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
+import org.jboss.portal.common.net.media.MediaType;
import org.jboss.portal.common.util.MultiValuedPropertyMap;
import org.jboss.portal.core.aspects.portlet.AjaxInterceptor;
import org.jboss.portal.core.controller.ControllerResponse;
@@ -179,7 +180,15 @@
try
{
+ /*
// Check that the associated portlet is deployed
+ Instance portletInstance = getPortletInstance(rendererContext);
+ if (portletInstance == null)
+ {
+ throw new NoSuchPortletException("");
+ }
+ portletInstance.getPortlet();
+*/
getPortletInstance(rendererContext).getPortlet();
}
catch (PortletInvokerException e)
@@ -246,7 +255,7 @@
{
CapabilitiesInfo capabilitiesInfo = instance.getPortlet().getInfo().getCapabilities();
- //
+ // Add window states for any media type
Set<WindowStateInfo> windowStatesInfo = capabilitiesInfo.getAllWindowStates();
supportedWindowStates = new ArrayList<WindowState>(windowStatesInfo.size());
for (WindowStateInfo windowStateInfo : windowStatesInfo)
@@ -258,7 +267,22 @@
}
}
- //
+ // Get current Media Type
+ MediaType mediaType = invocation.getContext().getMarkupInfo().getMediaType();
+
+ // Add window states for the current media type
+ windowStatesInfo = capabilitiesInfo.getWindowStates(mediaType);
+ supportedWindowStates = new ArrayList<WindowState>(windowStatesInfo.size());
+ for (WindowStateInfo windowStateInfo : windowStatesInfo)
+ {
+ WindowState tmp = windowStateInfo.getWindowState();
+ if (portal.getSupportedWindowStates().contains(tmp))
+ {
+ supportedWindowStates.add(tmp);
+ }
+ }
+
+ // Add modes for any media type
Set<ModeInfo> modesInfo = capabilitiesInfo.getAllModes();
supportedModes = new ArrayList<Mode>(modesInfo.size());
for (ModeInfo modeInfo : modesInfo)
@@ -270,6 +294,18 @@
}
}
+ // Add modes specific to the current media type
+ modesInfo = capabilitiesInfo.getModes(mediaType);
+ supportedModes = new ArrayList<Mode>(modesInfo.size());
+ for (ModeInfo modeInfo : modesInfo)
+ {
+ Mode tmp = modeInfo.getMode();
+ if (portal.getSupportedModes().contains(tmp))
+ {
+ supportedModes.add(tmp);
+ }
+ }
+
// Remove edit mode if the user is not logged it
if (rendererContext.getUser() == null)
{
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11130 - branches/JBoss_Portal_Branch_2_7/build.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 10:25:12 -0400 (Tue, 24 Jun 2008)
New Revision: 11130
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
Log:
Clean up
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 14:21:15 UTC (rev 11129)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-24 14:25:12 UTC (rev 11130)
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
-<project name="main.build"
- default="synchronize"
- basedir=".">
+<project name="main.build" default="synchronize" basedir=".">
<!-- Property File definitions -->
<!--<property file="local.properties"/>
@@ -10,11 +8,8 @@
<!-- Property Definitions -->
<property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/>
+ <property name="jboss.tasks.path" value="../tools/lib/jbossbuild.jar"/>
-
- <property name="jboss.tasks.path"
- value="../tools/lib/jbossbuild.jar"/>
-
<!-- Allow jbossbuild.repository to be set from (in order or priority)
+ Command line -Djbossbuild.repository=...
+ synchronize.properties jbossbuild.repository setting
@@ -29,7 +24,6 @@
<!-- File Imports -->
<import file="../tools/etc/jbossbuild/tasks.xml"/>
-
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
@@ -63,14 +57,14 @@
<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-logging" version="1.0.5.SP1-jboss"/>
<componentref name="apache-lucene" version="1.4.3"/>
<componentref name="apache-net" version="1.4.1"/>
<componentref name="apache-xerces" version="2.7.1"/>
<componentref name="asm" version="1.5.3"/>
<componentref name="beanshell" version="1.3.0"/>
- <componentref name="cglib" version="2.1.3"/>
- <componentref name="commons-el" version="1.0"/>
+ <componentref name="cglib" version="2.1.3"/>
+ <componentref name="commons-el" version="1.0"/>
<componentref name="dbunit" version="2.1"/>
<componentref name="dom4j" version="1.6.1jboss"/>
<componentref name="ehcache" version="1.2.2"/>
@@ -81,37 +75,36 @@
<componentref name="hibernate" version="3.2.0.CR2"/>
<componentref name="httpunit" version="1.6"/>
<componentref name="hsqldb" version="1.8.0.2"/>
- <componentref name="ibm-wsdl4j" version="1.6.2"/>
+ <componentref name="ibm-wsdl4j" version="1.6.2"/>
<componentref name="jakarta-cactus" version="1.7.2"/>
<componentref name="jakarta-io" version="1.0"/>
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
- <componentref name="jboss/aop" version="1.5.2.GA"/>
+ <componentref name="jboss/aop" version="1.5.2.GA"/>
<componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
<componentref name="jboss/cache" version="1.4.1.SP3"/>
<componentref name="jboss/jbossretro-rt" version="1.0.3.GA"/>
<componentref name="jboss/jbossws" version="2.0.1.SP2"/>
<componentref name="jboss/jbossxb" version="1.0.0.CR7"/>
<componentref name="jboss/microcontainer" version="1.0.2"/>
- <!-- <componentref name="jboss/remoting" version="1.4.3.GA"/> -->
- <componentref name="jboss/remoting" version="2.2.0.SP4"/>
+ <componentref name="jboss/remoting" version="2.2.0.SP4"/>
<componentref name="jboss/serialization" version="1.0.1.GA"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
<componentref name="jflex" version="1.4.0"/>
<componentref name="jcaptcha" version="1.0.6"/>
<componentref name="jwebunit" version="1.2"/>
- <componentref name="jcr" version="1.0"/>
- <componentref name="jetty" version="6.0"/>
+ <componentref name="jcr" version="1.0"/>
+ <componentref name="jetty" version="6.0"/>
<componentref name="jgroups" version="2.2.8"/>
<componentref name="jsunit" version="2.1"/>
<componentref name="junit" version="3.8.1"/>
- <componentref name="odmg" version="3.0"/>
- <componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="qdox" version="1.4"/>
+ <componentref name="odmg" version="3.0"/>
+ <componentref name="oswego-concurrent" version="1.3.4"/>
+ <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="sun-jaf" version="1.1"/>
- <componentref name="sun-javacc" version="3.2-portal"/>
+ <componentref name="sun-javacc" version="3.2-portal"/>
<componentref name="sun-javamail" version="1.3.1"/>
<componentref name="sun-jsf" version="1.2_04_P02"/>
<componentref name="sun-opends" version="snapshot"/>
@@ -126,26 +119,17 @@
<componentref name="portlet" version="2.0-Draft32"/>
<componentref name="sun-jstl" version="1.2"/>
<componentref name="jboss/web" version="2.1.0.GA"/>
+ </build>
- <!-- For the presentation branch only, not the mainstream branch -->
- <!-- <componentref name="gwt" version="1.4.60"/>
- <componentref name="mygwt" version="0.3.0"/> -->
-
- </build>
-
<synchronizeinfo/>
-
+
<target name="generate-lib-file"
description="generate libraries.ent and thirdparty license info"
depends="synchronize">
- <gen-lib-file filename="${generatedLibrariesFiles}"/>
- <visit-componentref-graph
- componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
+ <gen-lib-file filename="${generatedLibrariesFiles}"/>
+ <visit-componentref-graph componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
</target>
<!-- Generate the targets -->
<generate generate="jbossportal-thirdparty"/>
-
-
-
</project>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11129 - in branches/JBoss_Portal_Branch_2_7: cms/src/resources/test and 4 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-24 10:21:15 -0400 (Tue, 24 Jun 2008)
New Revision: 11129
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml
branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml
Log:
- More jBPM upgrade (should fix Portal deployment, though more tests are needed):
+ Updated Hibernate mappings for jBPM.
+ Added tx service to jBPM configuration.
+ Updated namespace in process definitions to use jBPM 3.2 URN.
- Note that in the upgrade to jBPM 3.2.2, we currently have lost the possibility to change the scheduling interval...
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -64,96 +64,95 @@
<property name="mappings">
<list elementClass="java.lang.String">
<value>domain.hbm.xml</value>
- <value>domain-identity.hbm.xml</value>
- <value>org/jbpm/graph/action/Script.hbm.xml</value>
- <value>org/jbpm/identity/User.hbm.xml</value>
- <value>org/jbpm/identity/Group.hbm.xml</value>
- <value>org/jbpm/identity/Membership.hbm.xml</value>
- <value>org/jbpm/db/hibernate.queries.hbm.xml</value>
- <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value>
- <value>org/jbpm/graph/def/Node.hbm.xml</value>
- <value>org/jbpm/graph/def/Transition.hbm.xml</value>
- <value>org/jbpm/graph/def/Event.hbm.xml</value>
- <value>org/jbpm/graph/def/Action.hbm.xml</value>
- <value>org/jbpm/graph/def/SuperState.hbm.xml</value>
- <value>org/jbpm/graph/def/ExceptionHandler.hbm.xml</value>
- <value>org/jbpm/instantiation/Delegation.hbm.xml</value>
- <value>org/jbpm/graph/node/StartState.hbm.xml</value>
- <value>org/jbpm/graph/node/EndState.hbm.xml</value>
- <value>org/jbpm/graph/node/ProcessState.hbm.xml</value>
- <value>org/jbpm/graph/node/Decision.hbm.xml</value>
- <value>org/jbpm/graph/node/Fork.hbm.xml</value>
- <value>org/jbpm/graph/node/Join.hbm.xml</value>
- <value>org/jbpm/graph/node/State.hbm.xml</value>
- <value>org/jbpm/graph/node/TaskNode.hbm.xml</value>
- <value>org/jbpm/context/def/ContextDefinition.hbm.xml</value>
- <value>org/jbpm/context/def/VariableAccess.hbm.xml</value>
- <value>org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml</value>
- <value>org/jbpm/taskmgmt/def/Swimlane.hbm.xml</value>
- <value>org/jbpm/taskmgmt/def/Task.hbm.xml</value>
- <value>org/jbpm/taskmgmt/def/TaskController.hbm.xml</value>
- <value>org/jbpm/module/def/ModuleDefinition.hbm.xml</value>
- <value>org/jbpm/bytes/ByteArray.hbm.xml</value>
- <value>org/jbpm/file/def/FileDefinition.hbm.xml</value>
- <value>org/jbpm/scheduler/def/CreateTimerAction.hbm.xml</value>
- <value>org/jbpm/scheduler/def/CancelTimerAction.hbm.xml</value>
- <value>org/jbpm/graph/exe/Comment.hbm.xml</value>
- <value>org/jbpm/graph/exe/ProcessInstance.hbm.xml</value>
- <value>org/jbpm/graph/exe/Token.hbm.xml</value>
- <value>org/jbpm/graph/exe/RuntimeAction.hbm.xml</value>
- <value>org/jbpm/module/exe/ModuleInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/ContextInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/TokenVariableMap.hbm.xml</value>
- <value>org/jbpm/context/exe/VariableInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml</value>
- <value>org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml</value>
- <value>org/jbpm/msg/Message.hbm.xml</value>
- <value>org/jbpm/msg/db/TextMessage.hbm.xml</value>
- <value>org/jbpm/command/ExecuteActionCommand.hbm.xml</value>
- <value>org/jbpm/command/ExecuteNodeCommand.hbm.xml</value>
- <value>org/jbpm/command/SignalCommand.hbm.xml</value>
- <value>org/jbpm/command/TaskInstanceEndCommand.hbm.xml</value>
- <value>org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml</value>
- <value>org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml</value>
- <value>org/jbpm/taskmgmt/exe/PooledActor.hbm.xml</value>
- <value>org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml</value>
- <value>org/jbpm/scheduler/exe/Timer.hbm.xml</value>
- <value>org/jbpm/logging/log/ProcessLog.hbm.xml</value>
- <value>org/jbpm/logging/log/MessageLog.hbm.xml</value>
- <value>org/jbpm/logging/log/CompositeLog.hbm.xml</value>
- <value>org/jbpm/graph/log/ActionLog.hbm.xml</value>
- <value>org/jbpm/graph/log/NodeLog.hbm.xml</value>
- <value>org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml</value>
- <value>org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml</value>
- <value>org/jbpm/graph/log/ProcessStateLog.hbm.xml</value>
- <value>org/jbpm/graph/log/SignalLog.hbm.xml</value>
- <value>org/jbpm/graph/log/TokenCreateLog.hbm.xml</value>
- <value>org/jbpm/graph/log/TokenEndLog.hbm.xml</value>
- <value>org/jbpm/graph/log/TransitionLog.hbm.xml</value>
- <value>org/jbpm/context/log/VariableLog.hbm.xml</value>
- <value>org/jbpm/context/log/VariableCreateLog.hbm.xml</value>
- <value>org/jbpm/context/log/VariableDeleteLog.hbm.xml</value>
- <value>org/jbpm/context/log/VariableUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml</value>
- <value>org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/TaskLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value>
- <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value>
+ <value>domain-identity.hbm.xml</value>
+ <value>org/jbpm/graph/action/Script.hbm.xml</value>
+ <value>org/jbpm/identity/User.hbm.xml</value>
+ <value>org/jbpm/identity/Group.hbm.xml</value>
+ <value>org/jbpm/identity/Membership.hbm.xml</value>
+ <value>org/jbpm/db/hibernate.queries.hbm.xml</value>
+ <value>org/jbpm/graph/action/MailAction.hbm.xml</value>
+ <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value>
+ <value>org/jbpm/graph/def/Node.hbm.xml</value>
+ <value>org/jbpm/graph/def/Transition.hbm.xml</value>
+ <value>org/jbpm/graph/def/Event.hbm.xml</value>
+ <value>org/jbpm/graph/def/Action.hbm.xml</value>
+ <value>org/jbpm/graph/def/SuperState.hbm.xml</value>
+ <value>org/jbpm/graph/def/ExceptionHandler.hbm.xml</value>
+ <value>org/jbpm/instantiation/Delegation.hbm.xml</value>
+ <value>org/jbpm/graph/node/StartState.hbm.xml</value>
+ <value>org/jbpm/graph/node/EndState.hbm.xml</value>
+ <value>org/jbpm/graph/node/ProcessState.hbm.xml</value>
+ <value>org/jbpm/graph/node/Decision.hbm.xml</value>
+ <value>org/jbpm/graph/node/Fork.hbm.xml</value>
+ <value>org/jbpm/graph/node/Join.hbm.xml</value>
+ <value>org/jbpm/graph/node/MailNode.hbm.xml</value>
+ <value>org/jbpm/graph/node/State.hbm.xml</value>
+ <value>org/jbpm/graph/node/TaskNode.hbm.xml</value>
+ <value>org/jbpm/context/def/ContextDefinition.hbm.xml</value>
+ <value>org/jbpm/context/def/VariableAccess.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/def/Swimlane.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/def/Task.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/def/TaskController.hbm.xml</value>
+ <value>org/jbpm/module/def/ModuleDefinition.hbm.xml</value>
+ <value>org/jbpm/bytes/ByteArray.hbm.xml</value>
+ <value>org/jbpm/file/def/FileDefinition.hbm.xml</value>
+ <value>org/jbpm/scheduler/def/CreateTimerAction.hbm.xml</value>
+ <value>org/jbpm/scheduler/def/CancelTimerAction.hbm.xml</value>
+ <value>org/jbpm/graph/exe/Comment.hbm.xml</value>
+ <value>org/jbpm/graph/exe/ProcessInstance.hbm.xml</value>
+ <value>org/jbpm/graph/exe/Token.hbm.xml</value>
+ <value>org/jbpm/graph/exe/RuntimeAction.hbm.xml</value>
+ <value>org/jbpm/module/exe/ModuleInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/ContextInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/TokenVariableMap.hbm.xml</value>
+ <value>org/jbpm/context/exe/VariableInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml</value>
+ <value>org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml</value>
+ <value>org/jbpm/job/Job.hbm.xml</value>
+ <value>org/jbpm/job/Timer.hbm.xml</value>
+ <value>org/jbpm/job/ExecuteNodeJob.hbm.xml</value>
+ <value>org/jbpm/job/ExecuteActionJob.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/exe/PooledActor.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml</value>
+ <value>org/jbpm/logging/log/ProcessLog.hbm.xml</value>
+ <value>org/jbpm/logging/log/MessageLog.hbm.xml</value>
+ <value>org/jbpm/logging/log/CompositeLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/ActionLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/NodeLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/ProcessStateLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/SignalLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/TokenCreateLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/TokenEndLog.hbm.xml</value>
+ <value>org/jbpm/graph/log/TransitionLog.hbm.xml</value>
+ <value>org/jbpm/context/log/VariableLog.hbm.xml</value>
+ <value>org/jbpm/context/log/VariableCreateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/VariableDeleteLog.hbm.xml</value>
+ <value>org/jbpm/context/log/VariableUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml</value>
+ <value>org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/TaskLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value>
+ <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value>
</list>
</property>
</bean>
@@ -167,21 +166,22 @@
<!-- setup for cms workflow testing -->
<bean name="WorkflowService" class="org.jboss.portal.workflow.service.WorkflowServiceImpl">
- <property name="jbpmConfigurationXml">
- <![CDATA[
- <jbpm-configuration>
- <jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
- </jbpm-context>
- <string name="resource.hibernate.cfg.xml" value="jbpm-hibernate.cfg.xml"/>
- <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
- <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/>
- <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/>
- <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/>
- <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/>
- <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/>
- </jbpm-configuration>
- ]]>
+ <property name="jbpmConfigurationXml">
+ <![CDATA[
+ <jbpm-configuration>
+ <jbpm-context>
+ <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory"/>
+ </jbpm-context>
+ <string name="resource.hibernate.cfg.xml" value="jbpm-hibernate.cfg.xml"/>
+ <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
+ <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/>
+ <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/>
+ <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/>
+ <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/>
+ <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/>
+ </jbpm-configuration>
+ ]]>
</property>
</bean>
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -5,165 +5,174 @@
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
- <session-factory>
- <!-- jdbc connection properties -->
- <property name="connection.datasource">java:/DefaultDS</property>
+ <session-factory>
+ <!-- jdbc connection properties -->
+ <property name="connection.datasource">java:/DefaultDS</property>
- <!-- other hibernate properties -->
- <property name="show_sql">false</property>
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
+ <!-- other hibernate properties -->
+ <property name="show_sql">false</property>
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
- <!-- caching properties -->
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
- <property name="cache.provider_configuration_file_resource_path">jbpm-ehcache.xml</property>
- <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+ <!-- caching properties -->
+ <property name="cache.use_second_level_cache">true</property>
+ <property name="cache.use_query_cache">true</property>
+ <property name="cache.provider_configuration_file_resource_path">jbpm-ehcache.xml</property>
+ <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
- <!-- managed environment transaction configuration -->
- <property
- name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+ <!-- managed environment transaction configuration -->
+ <property
+ name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup
+ </property>
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
- <!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
+ <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
- <!-- following mapping file has a dependendy on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+ <!-- following mapping file has a dependendy on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
- <!-- following mapping files have a dependendy on -->
- <!-- 'jbpm-identity-{version}.jar', mapping files -->
- <!-- of the pluggable jbpm identity component. -->
- <!-- comment out the following 3 lines if you don't-->
- <!-- want to use the default jBPM identity mgmgt -->
- <!-- component -->
- <mapping resource="org/jbpm/identity/User.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
- <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <!-- following mapping files have a dependendy on -->
+ <!-- 'jbpm-identity.jar', mapping files -->
+ <!-- of the pluggable jbpm identity component. -->
+ <!-- Uncomment the following 3 lines if you -->
+ <!-- want to use the jBPM identity mgmgt -->
+ <!-- component. -->
+ <!-- identity mappings (begin) -->
+ <mapping resource="org/jbpm/identity/User.hbm.xml"/>
+ <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
+ <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <!-- identity mappings (end) -->
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
+ <!-- following mapping files have a dependendy on -->
+ <!-- the JCR API -->
+ <!-- jcr mappings (begin) ===
+ <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+ ==== jcr mappings (end) -->
- <!-- hql queries and type defs -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
- <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
- <!-- msg.db mapping files -->
- <mapping resource="org/jbpm/msg/Message.hbm.xml"/>
- <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
- <!-- scheduler.exe mapping files -->
- <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/>
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
- </session-factory>
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
+ </session-factory>
</hibernate-configuration>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -26,35 +26,47 @@
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
<!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
- <!-- following mapping file has a dependendy on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+ <!-- following mapping file has a dependendy on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
- <!-- following mapping files have a dependendy on -->
- <!-- 'jbpm-identity-{version}.jar', mapping files -->
- <!-- of the pluggable jbpm identity component. -->
- <!-- comment out the following 3 lines if you don't-->
- <!-- want to use the default jBPM identity mgmgt -->
- <!-- component -->
- <mapping resource="org/jbpm/identity/User.hbm.xml"/>
+ <!-- following mapping files have a dependendy on -->
+ <!-- 'jbpm-identity.jar', mapping files -->
+ <!-- of the pluggable jbpm identity component. -->
+ <!-- Uncomment the following 3 lines if you -->
+ <!-- want to use the jBPM identity mgmgt -->
+ <!-- component. -->
+ <!-- identity mappings (begin) -->
+ <mapping resource="org/jbpm/identity/User.hbm.xml"/>
<mapping resource="org/jbpm/identity/Group.hbm.xml"/>
<mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <!-- identity mappings (end) -->
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
+ <!-- following mapping files have a dependendy on -->
+ <!-- the JCR API -->
+ <!-- jcr mappings (begin) ===
+ <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+ ==== jcr mappings (end) -->
- <!-- hql queries and type defs -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
@@ -63,50 +75,51 @@
<mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
<mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
<mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
<mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
@@ -118,25 +131,20 @@
<mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
- <!-- msg.db mapping files -->
- <mapping resource="org/jbpm/msg/Message.hbm.xml"/>
- <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
- <!-- scheduler.exe mapping files -->
- <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/>
-
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
<mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
<mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
<mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process-definition name="custom"
- xmlns="urn:jbpm.org:jpdl-3.1">
- <start-state>
- <transition to="end">
- <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
- </transition>
- </start-state>
+<process-definition name="custom" xmlns="urn:jbpm.org:jpdl-3.2">
+ <start-state>
+ <transition to="end">
+ <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/>
+ </transition>
+ </start-state>
- <end-state name="end"/>
+ <end-state name="end"/>
</process-definition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -56,6 +56,7 @@
<service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory"/>
</jbpm-context>
<string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/>
<string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128)
+++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129)
@@ -21,35 +21,47 @@
<property name="hibernate.use_sql_comments">true</property>
<!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
- <!-- following mapping file has a dependendy on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+ <!-- following mapping file has a dependendy on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
- <!-- following mapping files have a dependendy on -->
- <!-- 'jbpm-identity-{version}.jar', mapping files -->
- <!-- of the pluggable jbpm identity component. -->
- <!-- comment out the following 3 lines if you don't-->
- <!-- want to use the default jBPM identity mgmgt -->
- <!-- component -->
- <mapping resource="org/jbpm/identity/User.hbm.xml"/>
+ <!-- following mapping files have a dependendy on -->
+ <!-- 'jbpm-identity.jar', mapping files -->
+ <!-- of the pluggable jbpm identity component. -->
+ <!-- Uncomment the following 3 lines if you -->
+ <!-- want to use the jBPM identity mgmgt -->
+ <!-- component. -->
+ <!-- identity mappings (begin) -->
+ <mapping resource="org/jbpm/identity/User.hbm.xml"/>
<mapping resource="org/jbpm/identity/Group.hbm.xml"/>
<mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
+ <!-- identity mappings (end) -->
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
+ <!-- following mapping files have a dependendy on -->
+ <!-- the JCR API -->
+ <!-- jcr mappings (begin) ===
+ <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+ ==== jcr mappings (end) -->
- <!-- hql queries and type defs -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/>
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
<mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
@@ -58,50 +70,51 @@
<mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
<mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
<mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
<mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
<mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
<mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
@@ -113,25 +126,20 @@
<mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
<mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
- <!-- msg.db mapping files -->
- <mapping resource="org/jbpm/msg/Message.hbm.xml"/>
- <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/>
- <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/>
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
<mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
- <!-- scheduler.exe mapping files -->
- <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/>
-
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
<mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
<mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
<mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11128 - branches/JBoss_Portal_Branch_2_7/core.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-24 09:15:07 -0400 (Tue, 24 Jun 2008)
New Revision: 11128
Modified:
branches/JBoss_Portal_Branch_2_7/core/build.xml
Log:
- User correct jBPM library name
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-24 12:40:58 UTC (rev 11127)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-24 13:15:07 UTC (rev 11128)
@@ -344,7 +344,7 @@
<fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/>
<fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/>
<fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/>
- <fileset dir="${jbpm.jpdl.lib}" includes="jbpm.jar,jbpm-identity.jar"/>
+ <fileset dir="${jbpm.jpdl.lib}" includes="jbpm-jpdl.jar,jbpm-identity.jar"/>
</copy>
<copy todir="${build.resources}/jboss-portal/lib" failonerror="false">
17 years, 10 months
- 1
- 0