Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ap...@vh...> - 2006-05-22 21:33:21
|
Author: apevec Date: 2006-05-22 23:29:35 +0200 (Mon, 22 May 2006) New Revision: 1142 Removed: trunk/ccm-ldn-aplaws/bundles/camden/ Log: remove the custom bundle |
|
From: <ap...@vh...> - 2006-05-19 15:25:55
|
Author: apevec Date: 2006-05-19 17:22:14 +0200 (Fri, 19 May 2006) New Revision: 1141 Modified: trunk/ccm-ldn-exporter/bin/export-cats.sh trunk/ccm-ldn-exporter/bin/export-items.sh trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExportTool.java trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java Log: enable term domain export only Modified: trunk/ccm-ldn-exporter/bin/export-cats.sh =================================================================== --- trunk/ccm-ldn-exporter/bin/export-cats.sh 2006-05-19 11:33:22 UTC (rev 1140) +++ trunk/ccm-ldn-exporter/bin/export-cats.sh 2006-05-19 15:22:14 UTC (rev 1141) @@ -1,10 +1,13 @@ +#!/bin/bash -if [ -z $6 ]; then - echo "syntax: export.sh [purpose] [cat dir] [key] [url] [title] [versioon]" +if [ -z "$7" ]; then + echo "syntax: export-cats.sh [app URL] [context] [export dir] [key] [url] [title] [version]" + echo " e.g. export-cats.sh /navigation/ DEFAULT export APLAWS-NAV http://www.aplaws.org.uk/standards/nav/1.02/termslist.xml 'APLAWS Navigation List' 1.02" + exit 1; fi set -e -./ccm-run.sh com.arsdigita.london.exporter.CategoryExportTool "$*" +ccm-run com.arsdigita.london.exporter.CategoryExportTool "$@" Modified: trunk/ccm-ldn-exporter/bin/export-items.sh =================================================================== --- trunk/ccm-ldn-exporter/bin/export-items.sh 2006-05-19 11:33:22 UTC (rev 1140) +++ trunk/ccm-ldn-exporter/bin/export-items.sh 2006-05-19 15:22:14 UTC (rev 1141) @@ -1,9 +1,10 @@ +#!/bin/sh -if [ -z $3 ]; then - echo "syntax: export.sh [item dir] [asset dir] [content section]" +if [ -z "$3" ]; then + echo "syntax: export-items.sh [item dir] [asset dir] [content section]" exit 1; fi set -e -ccm-run.sh com.arsdigita.london.exporter.ItemExportTool "$@" +ccm-run com.arsdigita.london.exporter.ItemExportTool "$@" Modified: trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExportTool.java =================================================================== --- trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExportTool.java 2006-05-19 11:33:22 UTC (rev 1140) +++ trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExportTool.java 2006-05-19 15:22:14 UTC (rev 1141) @@ -20,6 +20,7 @@ import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; import com.arsdigita.categorization.Category; import com.arsdigita.util.UncheckedWrapperException; @@ -35,18 +36,28 @@ public class CategoryExportTool extends Program { + boolean exportItems = false; + public CategoryExportTool() { super("Category Export Tool", - "1.0.0", - "[app] [context] [cat dir] [key] [url] [title] [version]"); + "1.0.1", + "[app URL] [context] [export dir] [key] [url] [title] [version]"); + getOptions().addOption + (OptionBuilder + .hasArg(false) + .withLongOpt("items") + .withDescription("Export items/terms mappings") + .create('i')); } public void doRun(CommandLine cmdLine) { + if (cmdLine.hasOption('i')) { + exportItems = true; + } String[] args = cmdLine.getArgs(); if (args.length != 7) { - System.out.println("ARgs" + args.length); for (int i = 0 ; i < args.length ; i++) { - System.out.println("Arg " + args[i]); + System.out.print("arg"+i+"='" + args[i]+"' "); } help(System.err); System.exit(1); @@ -67,7 +78,12 @@ Transaction txn = new Transaction() { public void doRun() { Application appl = Application.retrieveApplicationForPath(app); - Category root = Category.getRootForObject(appl, context); + Category root; + if ("DEFAULT".equals(context)) { + root = Category.getRootForObject(appl, null); + } else { + root = Category.getRootForObject(appl, context); + } CategoryExporter catExporter = new CategoryExporter(catDir); try { @@ -77,7 +93,8 @@ title, null, version, - new Date()); + new Date(), + exportItems); } catch (MalformedURLException ex) { throw new UncheckedWrapperException("Cannot parse url " + url, ex); } Modified: trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java =================================================================== --- trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java 2006-05-19 11:33:22 UTC (rev 1140) +++ trunk/ccm-ldn-exporter/src/com/arsdigita/london/exporter/CategoryExporter.java 2006-05-19 15:22:14 UTC (rev 1141) @@ -60,6 +60,23 @@ m_idMaps = new HashMap(); } + public void export(Category root, + String key, + URL url, + String title, + String description, + String version, + Date released) { + + export(root, + key, + url, + title, + description, + version, + released, + true); + } public void export(Category root, String key, @@ -67,10 +84,13 @@ String title, String description, String version, - Date released) { + Date released, + boolean exportItems) { exportDomain(root, key, url, title, description, version, released); exportHierarchy(root, key, url); - exportItems(root, key, url); + if (exportItems) { + exportItems(root, key, url); + } } @@ -251,5 +271,5 @@ } catch (IOException ex) { throw new UncheckedWrapperException("cannot write file", ex); } + } } -} |
|
From: <ap...@vh...> - 2006-05-19 11:36:57
|
Author: apevec Date: 2006-05-19 13:33:22 +0200 (Fri, 19 May 2006) New Revision: 1140 Removed: trunk/ccm-core/bin/run.sh Log: remove obsolete script Deleted: trunk/ccm-core/bin/run.sh |
|
From: <ap...@vh...> - 2006-05-17 15:03:01
|
Author: apevec
Date: 2006-05-17 16:59:32 +0200 (Wed, 17 May 2006)
New Revision: 1139
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
Log:
use full URL
Modified: trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-15 19:21:22 UTC (rev 1138)
+++ trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-17 14:59:32 UTC (rev 1139)
@@ -255,19 +255,18 @@
Assert.assertNotNull(item, "item associated with this CMSTask");
// for enable events, this will be the finish URL
// for everything else, it will be the item authoring URL
- String emailURL = null;
+ String emailURL;
String authoringURL = getAuthoringURL(item);
if (ENABLE_OP.equals(operation)) {
emailURL = getFinishURL(item.getID());
} else {
emailURL = authoringURL;
}
- String fullURL = URL.there(emailURL, null).getURL();
// see CMSResources.properties for how these values are used
Object[] g11nArgs = new Object[10];
g11nArgs[0] = item.getDisplayName();
g11nArgs[1] = new Double(getTaskType().doubleValue());
- g11nArgs[2] = fullURL;
+ g11nArgs[2] = URL.there(emailURL, null).getURL();
g11nArgs[3] = KernelHelper.getSiteName();
g11nArgs[4] = KernelHelper.getSystemAdministratorEmailAddress();
g11nArgs[5] = new Date();
@@ -285,7 +284,7 @@
g11nArgs[7] = (String) GlobalizationUtil.globalize("cms.ui.unknown").localize();
}
g11nArgs[8] = getStartDate();
- g11nArgs[9] = authoringURL;
+ g11nArgs[9] = URL.there(authoringURL, null).getURL();
String subject = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.subject." + operation,
g11nArgs).localize();
String body = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.body." + operation,
|
|
From: <ap...@vh...> - 2006-05-15 19:24:40
|
Author: apevec
Date: 2006-05-15 21:21:22 +0200 (Mon, 15 May 2006)
New Revision: 1138
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
Log:
..extend the parameter array
Modified: trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-15 18:20:14 UTC (rev 1137)
+++ trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-15 19:21:22 UTC (rev 1138)
@@ -264,7 +264,7 @@
}
String fullURL = URL.there(emailURL, null).getURL();
// see CMSResources.properties for how these values are used
- Object[] g11nArgs = new Object[9];
+ Object[] g11nArgs = new Object[10];
g11nArgs[0] = item.getDisplayName();
g11nArgs[1] = new Double(getTaskType().doubleValue());
g11nArgs[2] = fullURL;
|
|
From: <ap...@vh...> - 2006-05-15 18:23:43
|
Author: apevec
Date: 2006-05-15 20:20:14 +0200 (Mon, 15 May 2006)
New Revision: 1137
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
Log:
additional element from notification text customisation
{9} - authoring URL (...&set_tab=1)
Modified: trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-11 14:19:52 UTC (rev 1136)
+++ trunk/ccm-cms/src/com/arsdigita/cms/workflow/CMSTask.java 2006-05-15 18:20:14 UTC (rev 1137)
@@ -256,10 +256,11 @@
// for enable events, this will be the finish URL
// for everything else, it will be the item authoring URL
String emailURL = null;
+ String authoringURL = getAuthoringURL(item);
if (ENABLE_OP.equals(operation)) {
emailURL = getFinishURL(item.getID());
} else {
- emailURL = getAuthoringURL(item);
+ emailURL = authoringURL;
}
String fullURL = URL.there(emailURL, null).getURL();
// see CMSResources.properties for how these values are used
@@ -284,6 +285,7 @@
g11nArgs[7] = (String) GlobalizationUtil.globalize("cms.ui.unknown").localize();
}
g11nArgs[8] = getStartDate();
+ g11nArgs[9] = authoringURL;
String subject = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.subject." + operation,
g11nArgs).localize();
String body = (String) GlobalizationUtil.globalize("cms.ui.workflow.email.body." + operation,
|
|
From: <ssk...@vh...> - 2006-05-11 14:23:10
|
Author: sskracic
Date: 2006-05-11 16:19:52 +0200 (Thu, 11 May 2006)
New Revision: 1136
Modified:
trunk/ccm-ldn-navigation/application.xml
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
Log:
Category URLs in categoryMenu widget will be generated as /ccm/<navapp_url>/path/to/cat
regardless of the current page context (/ccm/navigation/, /ccm/content/, ...). URLs
will resort to "redirect URLs" only when URL of a category or any of its ancestors is not set.
Modified: trunk/ccm-ldn-navigation/application.xml
===================================================================
--- trunk/ccm-ldn-navigation/application.xml 2006-05-10 19:21:49 UTC (rev 1135)
+++ trunk/ccm-ldn-navigation/application.xml 2006-05-11 14:19:52 UTC (rev 1136)
@@ -3,7 +3,7 @@
name="ccm-ldn-navigation"
prettyName="Navigation"
version="6.3.0"
- release="6"
+ release="7"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java 2006-05-10 19:21:49 UTC (rev 1135)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java 2006-05-11 14:19:52 UTC (rev 1136)
@@ -5,12 +5,12 @@
* 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 library 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 library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -24,6 +24,7 @@
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
+import com.arsdigita.kernel.URLService;
import com.arsdigita.web.Application;
import com.arsdigita.web.URL;
import com.arsdigita.web.Web;
@@ -43,7 +44,6 @@
public abstract class AbstractTree extends CategoryComponent {
-
protected Element generateTreeXML(HttpServletRequest request,
HttpServletResponse response,
Category cat,
@@ -59,12 +59,12 @@
childList = new TreeSet();
children.put(parentID, childList);
}
-
+
childList.add(new CategorySortKeyPair
(category,
(BigDecimal)cats.get("parents.link.sortKey")));
}
-
+
String url = null;
Application app = Web.getContext().getApplication();
if (app instanceof Navigation) {
@@ -88,18 +88,23 @@
path.close();
if( common ) url = "";
+ } else {
+ url = URLService.locate(cat.getOID());
+ if (!url.endsWith("/")) {
+ url = null;
+ }
}
- return generateNodeXML(request,
- response,
+ return generateNodeXML(request,
+ response,
cat,
null,
selected,
children,
url);
-
+
}
-
+
protected Element generateNodeXML(HttpServletRequest request,
HttpServletResponse response,
Category cat,
@@ -111,9 +116,14 @@
return null;
}
- String url = (path == null) ?
- Navigation.redirectURL(cat.getOID()) :
- URL.here(Web.getRequest(), path + "/").toString();
+ String url = null;
+ if (path == null) {
+ url = Navigation.redirectURL(cat.getOID());
+ } else if (path.endsWith("/")) {
+ url = path;
+ } else {
+ url = URL.here(Web.getRequest(), path + "/").toString();
+ }
Element el = generateCategoryXML(request,
response,
@@ -142,7 +152,7 @@
children,
child.getURL() == null ||
path == null ? null :
- path + "/" + child.getURL()
+ url + child.getURL() + "/"
);
if (childEl != null) {
el.addContent(childEl);
@@ -167,7 +177,7 @@
public BigDecimal getSortKey() {
return m_sortKey;
}
-
+
public int compareTo(Object o) {
return m_sortKey.compareTo(((CategorySortKeyPair)o).m_sortKey);
}
|
|
From: <ap...@vh...> - 2006-05-10 19:25:10
|
Author: apevec
Date: 2006-05-10 21:21:49 +0200 (Wed, 10 May 2006)
New Revision: 1135
Modified:
trunk/ccm-core/src/com/arsdigita/bebop/TabbedPane.java
Log:
show which component is selected
Modified: trunk/ccm-core/src/com/arsdigita/bebop/TabbedPane.java
===================================================================
--- trunk/ccm-core/src/com/arsdigita/bebop/TabbedPane.java 2006-05-03 22:07:18 UTC (rev 1134)
+++ trunk/ccm-core/src/com/arsdigita/bebop/TabbedPane.java 2006-05-10 19:21:49 UTC (rev 1135)
@@ -394,6 +394,7 @@
exportAttributes(strip);
Pane current = getCurrent(data);
+ strip.addAttribute("selected",current.getComponent().getClass().getName());
Iterator tabs;
int i;
for (tabs = children(), i = 0; tabs.hasNext(); i++) {
|
|
From: <ap...@vh...> - 2006-05-03 22:10:13
|
Author: apevec
Date: 2006-05-04 00:07:18 +0200 (Thu, 04 May 2006)
New Revision: 1134
Modified:
trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
Log:
don't mix JSP and XML syntax, coverted all to XML
Modified: trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
===================================================================
--- trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp 2006-05-03 21:28:34 UTC (rev 1133)
+++ trunk/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp 2006-05-03 22:07:18 UTC (rev 1134)
@@ -12,8 +12,6 @@
<jsp:directive.page import="com.arsdigita.london.theme.Theme"/>
<jsp:directive.page import="javax.servlet.jsp.JspWriter"/>
<jsp:directive.page import="com.arsdigita.domain.DataObjectNotFoundException"/>
- <%// <jsp:directive.page import="com.arsdigita.cms.publishToFile.LocalRequestPassword"/>
-%>
<jsp:directive.page import="com.arsdigita.dispatcher.AccessDeniedException"/>
<jsp:directive.page import="com.arsdigita.kernel.Party"/>
<jsp:directive.page import="com.arsdigita.kernel.Kernel"/>
@@ -23,8 +21,6 @@
<jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionService"/>
<jsp:scriptlet>
DispatcherHelper.cacheDisable(response);
- </jsp:scriptlet>
-<%
Party party = Kernel.getContext().getParty();
Resource resource = Kernel.getContext().getResource();
PermissionDescriptor permDescriptor =
@@ -33,8 +29,9 @@
party);
// we don't do permissions checks yet because we don't have an easy
// way to do it.
+// jsp:directive.page import="com.arsdigita.cms.publishToFile.LocalRequestPassword"
/*
- if (!LocalRequestPassword.validLocalRequest(request) && !PermissionService.checkPermission(permDescriptor)) {
+ if (!LocalRequestPassword.validLocalRequest(request) && !PermissionService.checkPermission(permDescriptor)) {
throw new AccessDeniedException();
}
*/
@@ -58,7 +55,7 @@
String updateType = request.getParameter("updateType");
ThemeFileManager pubManager = ThemePublishedFileManager.getInstance();
ThemeFileManager devManager = ThemeDevelopmentFileManager.getInstance();
- if (pubManager != null && (updateType == null || ThemeFile.LIVE.equals(updateType))) {
+ if (pubManager != null && (updateType == null || ThemeFile.LIVE.equals(updateType))) {
if (theme == null) {
pubManager.updateAllThemesNow();
} else {
@@ -66,13 +63,15 @@
}
}
- if (devManager != null && (updateType == null || ThemeFile.DRAFT.equals(updateType))) {
+ if (devManager != null && (updateType == null || ThemeFile.DRAFT.equals(updateType))) {
if (theme == null) {
devManager.updateAllThemesNow();
} else {
devManager.updateThemeNow(theme);
}
}
-%>
+ </jsp:scriptlet>
+<jsp:text>
Sync Complete
+</jsp:text>
</jsp:root>
|
|
From: <ap...@vh...> - 2006-05-03 21:41:21
|
Author: apevec
Date: 2006-05-03 23:00:00 +0200 (Wed, 03 May 2006)
New Revision: 1132
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
Log:
extension point for Content Item portlet
subclasses can render additional elements, e.g. sections for MPA
Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java 2006-05-02 15:16:38 UTC (rev 1131)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/portlet/ContentItemPortletRenderer.java 2006-05-03 21:00:00 UTC (rev 1132)
@@ -54,28 +54,31 @@
m_portlet.getOID() );
return;
}
+ renderItem(item.getPublicVersion(), content);
+ }
- Element contentItem = content.newChildElement
- ( "cms:item", CMS.CMS_XML_NS );
+ protected void renderItem(ContentItem item, Element content) {
+ Element contentItem = content.newChildElement("cms:item",
+ CMS.CMS_XML_NS);
- DomainObjectXMLRenderer renderer =
- new DomainObjectXMLRenderer(contentItem);
+ DomainObjectXMLRenderer renderer = new DomainObjectXMLRenderer(
+ contentItem);
- renderer.setWrapAttributes( true );
- renderer.setWrapRoot( false );
- renderer.setWrapObjects( false );
+ renderer.setWrapAttributes(true);
+ renderer.setWrapRoot(false);
+ renderer.setWrapObjects(false);
- renderer.walk( item.getPublicVersion(),
- SimpleXMLGenerator.ADAPTER_CONTEXT );
+ renderer.walk(item,
+ SimpleXMLGenerator.ADAPTER_CONTEXT);
}
-
+
public String getCacheKey(PageState state) {
ContentItem item = m_portlet.getContentItem();
- if( null == item ) return null;
+ if( null == item ) return "";
if( item.isLive() ) return item.getPublicVersion().getOID().toString();
// Don't cache it if it's not live
- return null;
+ return "";
}
// For a given cache key a contnet item is *never* dirty,
|
|
From: <ap...@vh...> - 2006-05-03 21:31:45
|
Author: apevec Date: 2006-05-03 23:28:34 +0200 (Wed, 03 May 2006) New Revision: 1133 Added: contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/ contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/oracle-se-1.0.0-1.0.1.sql contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/postgres-1.0.0-1.0.1.sql contrib/ccm-ldn-camden-eforms/trunk/src/ccm-ldn-camden-eforms.upgrade Modified: contrib/ccm-ldn-camden-eforms/trunk/application.xml contrib/ccm-ldn-camden-eforms/trunk/pdl/com/arsdigita/camden/cms/contenttypes/EForm.pdl contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/EForm.java contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java Log: add description for EForm aka URLredirect content type Modified: contrib/ccm-ldn-camden-eforms/trunk/application.xml =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/application.xml 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/application.xml 2006-05-03 21:28:34 UTC (rev 1133) @@ -2,7 +2,7 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-ldn-camden-eforms" prettyName="Camden eForms Content Type" - version="1.0.0" + version="1.0.1" release="1" webapp="ROOT"> <ccm:dependencies> Modified: contrib/ccm-ldn-camden-eforms/trunk/pdl/com/arsdigita/camden/cms/contenttypes/EForm.pdl =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/pdl/com/arsdigita/camden/cms/contenttypes/EForm.pdl 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/pdl/com/arsdigita/camden/cms/contenttypes/EForm.pdl 2006-05-03 21:28:34 UTC (rev 1133) @@ -22,7 +22,7 @@ object type EForm extends ContentPage { String [0..1] url = ct_eform.url VARCHAR(2000); + String [0..1] description = ct_eform.description; reference key (ct_eform.form_id); } - Added: contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/oracle-se-1.0.0-1.0.1.sql =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/oracle-se-1.0.0-1.0.1.sql 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/oracle-se-1.0.0-1.0.1.sql 2006-05-03 21:28:34 UTC (rev 1133) @@ -0,0 +1 @@ +alter table ct_eform add (description VARCHAR2(4000)); Added: contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/postgres-1.0.0-1.0.1.sql =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/postgres-1.0.0-1.0.1.sql 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/sql/ccm-ldn-camden-eforms/upgrade/postgres-1.0.0-1.0.1.sql 2006-05-03 21:28:34 UTC (rev 1133) @@ -0,0 +1,3 @@ +begin; +alter table ct_eform add description VARCHAR(4000); +end; Added: contrib/ccm-ldn-camden-eforms/trunk/src/ccm-ldn-camden-eforms.upgrade =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/src/ccm-ldn-camden-eforms.upgrade 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/src/ccm-ldn-camden-eforms.upgrade 2006-05-03 21:28:34 UTC (rev 1133) @@ -0,0 +1,5 @@ +<upgrade> + <version from="1.0.0" to="1.0.1"> + <script sql="ccm-ldn-camden-eforms/upgrade/::database::-1.0.0-1.0.1.sql"/> + </version> +</upgrade> Modified: contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/EForm.java =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/EForm.java 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/EForm.java 2006-05-03 21:28:34 UTC (rev 1133) @@ -39,6 +39,7 @@ /** PDL property name for definition */ public static final String URL = "url"; + public static final String DESCRIPTION = "description"; /** Data object type for this domain object */ public static final String BASE_DATA_OBJECT_TYPE @@ -86,4 +87,12 @@ public void setURL( String url ) { set(URL, url); } + + public String getDescription() { + return (String) get(DESCRIPTION); + } + + public void setDescription( String description ) { + set(DESCRIPTION, description); + } } Modified: contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertiesStep.java 2006-05-03 21:28:34 UTC (rev 1133) @@ -68,6 +68,7 @@ sheet.add( "Name:", EForm.NAME ); sheet.add( "Title:", EForm.TITLE ); sheet.add( "URL:", EForm.URL ); + sheet.add( "Description:", EForm.DESCRIPTION ); return sheet; } Modified: contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java =================================================================== --- contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java 2006-05-03 21:00:00 UTC (rev 1132) +++ contrib/ccm-ldn-camden-eforms/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/EFormPropertyForm.java 2006-05-03 21:28:34 UTC (rev 1133) @@ -20,9 +20,11 @@ import com.arsdigita.camden.cms.contenttypes.EForm; import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.ParameterModel; @@ -39,6 +41,7 @@ implements FormProcessListener, FormInitListener { private TextField m_url; + private TextArea m_description; /** * Creates a new form to edit the EForm object specified @@ -57,20 +60,23 @@ super.addWidgets(); add(new Label("URL:")); - ParameterModel urlParam - = new StringParameter("url"); - m_url = new TextField(urlParam); + m_url = new TextField(EForm.URL); m_url.setSize(40); add(m_url); + + add(new Label("Description:")); + m_description = new TextArea(EForm.DESCRIPTION, 5, 40, TextArea.SOFT); + add(m_description); } /** Form initialisation hook. Fills widgets with data. */ public void init(FormSectionEvent fse) { EForm site = (EForm) super.initBasicWidgets(fse); - - m_url.setValue(fse.getPageState(), - site.getURL()); + + PageState state = fse.getPageState(); + m_url.setValue(state, site.getURL()); + m_description.setValue(state,site.getDescription()); } /** Form processing hook. Saves EForm object. */ @@ -78,12 +84,13 @@ EForm site = (EForm) super.processBasicWidgets(fse); + PageState state = fse.getPageState(); // save only if save button was pressed if (site != null && getSaveCancelSection().getSaveButton() - .isSelected(fse.getPageState())) { - site.setURL((String)m_url.getValue(fse.getPageState())); - site.save(); + .isSelected(state)) { + site.setURL((String)m_url.getValue(state)); + site.setDescription((String)m_description.getValue(state)); } } } |
|
From: <ap...@vh...> - 2006-05-02 15:19:32
|
Author: apevec
Date: 2006-05-02 17:16:38 +0200 (Tue, 02 May 2006)
New Revision: 1131
Modified:
trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java
Log:
fixes for content item redirection:
404 for public users when try to access
switch to draft version when context=draft
Modified: trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java 2006-05-02 14:18:22 UTC (rev 1130)
+++ trunk/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java 2006-05-02 15:16:38 UTC (rev 1131)
@@ -40,11 +40,12 @@
import com.arsdigita.web.URL;
import com.arsdigita.web.ParameterMap;
+import com.arsdigita.web.Web;
import org.apache.log4j.Logger;
public class ItemURLFinder implements URLFinder {
-
+
private static final Logger s_log = Logger.getLogger(ItemURLFinder.class);
public String find(OID oid,String context) throws NoValidURLException {
@@ -58,11 +59,11 @@
.newInstance(oid);
} catch (DataObjectNotFoundException ex) {
throw new NoValidURLException(
- "cannot instantiate item " + oid +
+ "cannot instantiate item " + oid +
" message: " + ex.getMessage()
);
}
-
+
if (ContentItem.LIVE.equals(context)) {
if (item.isLive()) {
if (!item.isLiveVersion()) {
@@ -78,27 +79,26 @@
);
}
}
-
+
return find(item, context);
}
-
- public String find(OID oid)
- throws NoValidURLException {
+
+ public String find(OID oid) throws NoValidURLException {
if (s_log.isDebugEnabled()) {
s_log.debug("Locating " + oid);
}
-
+
ContentItem item;
try {
item = (ContentItem)DomainObjectFactory
.newInstance(oid);
} catch (DataObjectNotFoundException ex) {
throw new NoValidURLException(
- "cannot instantiate item " + oid +
+ "cannot instantiate item " + oid +
" message: " + ex.getMessage()
);
}
-
+
if (s_log.isDebugEnabled()) {
s_log.debug("Item version is " + item.getVersion());
}
@@ -107,8 +107,8 @@
// links with no context defaulted to the live version (if one existed). Changing
// that behavior broke a lot of links in static content that couldn't easily be updated.
// This change restores the old behavior. We don't get a regression of bz 116226
- // (which bz 41315 was intended to fix) because the CMS search.xsl has been updated to
- // append "&context=draft" to the search results. The CMS DHTML editor has also been
+ // (which bz 41315 was intended to fix) because the CMS search.xsl has been updated to
+ // append "&context=draft" to the search results. The CMS DHTML editor has also been
// updated to append generated links with "&context=live". If at some point in the future
// all unqualified links have been removed, then this fix could be removed as well.
if (item.isLive() && !item.isLiveVersion()) {
@@ -122,76 +122,89 @@
}
private String find(ContentItem item,
- String context) {
+ String context) throws NoValidURLException {
ContentSection section = item.getContentSection();
ItemResolver resolver = section.getItemResolver();
// If the ContentItem is an index object for a Category, redirect
// to the URL for that Category instead of the item.
- // in fact don't do that if we have content='draft', in which case
- // always send to the admin screen (that's for results of the admin search)
+ // in fact don't do that if we have content='draft', in which case
+ // always send to the admin screen (that's for results of the admin
+ // search)
if (!ContentItem.DRAFT.equals(context)) {
- ACSObject parent = item.getParent();
- ContentBundle bundle = null;
- if (parent instanceof ContentBundle) {
- bundle = (ContentBundle) ((ContentBundle) parent).getDraftVersion();
- }
- if (bundle != null) {
- DataAssociationCursor categories =
- ((DataAssociation) DomainServiceInterfaceExposer.
- get(bundle, Category.CATEGORIES)).cursor();
- categories.addEqualsFilter("link." + Category.IS_INDEX, Boolean.TRUE);
-
- if (categories.next()) {
- Category indexCat = (Category) DomainObjectFactory.
- newInstance(categories.getDataObject());
- categories.close();
- try {
- if (s_log.isDebugEnabled()) {
- s_log.debug(item + " is a Category index item. Resolving URL for " +
- indexCat);
- }
- return URLService.locate(indexCat.getOID(), context);
- } catch (URLFinderNotFoundException ufnfe) {
- if (s_log.isDebugEnabled()) {
- s_log.debug("Could not find URLFinder for " + indexCat +
- ", continuing with URL resolution for " + item,
- ufnfe);
- }
- } catch (NoValidURLException nvue) {
- if (s_log.isDebugEnabled()) {
- s_log.debug("Could not find valid URL for " + indexCat +
- ", continuing with URL resolution for " + item,
- nvue);
- }
- }
- }
- }
- }
+ ACSObject parent = item.getParent();
+ ContentBundle bundle = null;
+ if (parent instanceof ContentBundle) {
+ bundle = (ContentBundle) ((ContentBundle) parent).getDraftVersion();
+ }
+ if (bundle != null) {
+ DataAssociationCursor categories =
+ ((DataAssociation) DomainServiceInterfaceExposer.
+ get(bundle, Category.CATEGORIES)).cursor();
+ categories.addEqualsFilter("link." + Category.IS_INDEX, Boolean.TRUE);
+ if (categories.next()) {
+ Category indexCat = (Category) DomainObjectFactory.
+ newInstance(categories.getDataObject());
+ categories.close();
+ try {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug(item + " is a Category index item. Resolving URL for " + indexCat);
+ }
+ return URLService.locate(indexCat.getOID(), context);
+ } catch (URLFinderNotFoundException ufnfe) {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Could not find URLFinder for " + indexCat +
+ ", continuing with URL resolution for " + item,
+ ufnfe);
+ }
+ } catch (NoValidURLException nvue) {
+ if (s_log.isDebugEnabled()) {
+ s_log.debug("Could not find valid URL for " + indexCat +
+ ", continuing with URL resolution for " + item,
+ nvue);
+ }
+ }
+ }
+ }
+ } else { // DRAFT context
+ // public users should get 404 when item gets unpublished
+ if (!Web.getUserContext().isLoggedIn()) {
+ throw new NoValidURLException("user must be logged-in to get draft");
+ } else {
+ // force the switch to draft version at this point
+ // otherwise resolver below breaks with:
+ // java.lang.IllegalStateException: Generating draft url: item must be draft version
+ if (!item.isDraftVersion()) {
+ item = item.getDraftVersion();
+ s_log.debug("switching to draft version");
+ }
+ }
+ }
String url = resolver.generateItemURL(null, item, section, context);
-
+
if (s_log.isDebugEnabled()) {
s_log.debug("Resolved " + item + " in " + context + " to " + url);
}
-
+
final int sep = url.indexOf('?');
URL destination = null;
-
+
if (sep == -1) {
destination = URL.there(url, null);
} else {
final ParameterMap params = ParameterMap.fromString
(url.substring(sep + 1));
-
+
destination = URL.there(url.substring(0, sep), params);
}
-
+
if (s_log.isDebugEnabled()) {
s_log.debug("After munging, destination is " + destination);
- }
-
+ }
+
return destination.toString();
}
+
}
|
|
From: <ap...@vh...> - 2006-05-02 14:21:11
|
Author: apevec Date: 2006-05-02 16:18:22 +0200 (Tue, 02 May 2006) New Revision: 1130 Modified: trunk/ccm-core/bin/ccm-run Log: quote arguments Modified: trunk/ccm-core/bin/ccm-run =================================================================== --- trunk/ccm-core/bin/ccm-run 2006-05-02 14:17:55 UTC (rev 1129) +++ trunk/ccm-core/bin/ccm-run 2006-05-02 14:18:22 UTC (rev 1130) @@ -45,4 +45,4 @@ echo $CCM_CLASSPATH | tr : "\n" -java -cp $CCM_CLASSPATH -Dccm.home=$CCM_HOME $* +java -cp $CCM_CLASSPATH -Dccm.home=$CCM_HOME "$@" |
|
From: <ap...@vh...> - 2006-05-02 14:20:55
|
Author: apevec
Date: 2006-05-02 16:17:55 +0200 (Tue, 02 May 2006)
New Revision: 1129
Modified:
trunk/tools/tools/bin/ccm-run
Log:
quote arguments properly, they might include spaces
Modified: trunk/tools/tools/bin/ccm-run
===================================================================
--- trunk/tools/tools/bin/ccm-run 2006-04-30 13:40:54 UTC (rev 1128)
+++ trunk/tools/tools/bin/ccm-run 2006-05-02 14:17:55 UTC (rev 1129)
@@ -82,7 +82,10 @@
CCM::Util::error("syntax: ccm-run [--verbose] <class>");
}
-my $command = $runtime->getJavaCommand() . " -cp $classpath $java_opts $sysproperties @ARGV";
+my $command = $runtime->getJavaCommand() . " -cp $classpath $java_opts $sysproperties";
+foreach $a (@ARGV) {
+ $command .= " \"$a\"";
+}
if ($verbose) {
print ((join "\n", (CCM::Util::splitpath($classpath))) . "\n");
print "$command\n";
|
|
From: <ap...@vh...> - 2006-04-30 13:43:56
|
Author: apevec
Date: 2006-04-30 15:40:54 +0200 (Sun, 30 Apr 2006)
New Revision: 1128
Modified:
trunk/ccm-core/src/com/redhat/persistence/oql/Static.java
Log:
teach Rafi's persistence about last_day oracle-ism
Modified: trunk/ccm-core/src/com/redhat/persistence/oql/Static.java
===================================================================
--- trunk/ccm-core/src/com/redhat/persistence/oql/Static.java 2006-04-30 10:31:53 UTC (rev 1127)
+++ trunk/ccm-core/src/com/redhat/persistence/oql/Static.java 2006-04-30 13:40:54 UTC (rev 1128)
@@ -65,7 +65,7 @@
"upper", "lower",
"trim", // only trim(str) syntax is allowed
// postgres supported oracle-isms
- "substr", "length", "nvl"
+ "substr", "length", "nvl", "last_day"
};
for (int i = 0; i < functions.length; i++) {
s_functions.add(functions[i]);
|
|
From: <ap...@vh...> - 2006-04-30 10:34:51
|
Author: apevec Date: 2006-04-30 12:31:53 +0200 (Sun, 30 Apr 2006) New Revision: 1127 Modified: trunk/ccm-core/sql/ccm-core/postgres/oracle-compatibility.sql Log: one more useful Oracle compatibility function from: http://archives.postgresql.org/pgsql-general/2003-09/msg00068.php Modified: trunk/ccm-core/sql/ccm-core/postgres/oracle-compatibility.sql =================================================================== --- trunk/ccm-core/sql/ccm-core/postgres/oracle-compatibility.sql 2006-04-28 19:20:42 UTC (rev 1126) +++ trunk/ccm-core/sql/ccm-core/postgres/oracle-compatibility.sql 2006-04-30 10:31:53 UTC (rev 1127) @@ -61,3 +61,8 @@ return ~$1; end; ' language 'plpgsql'; + +create or replace function last_day(date) returns date as 'select +cast(date_trunc(''month'', $1) + ''1 month''::interval as date) - 1' +language sql; + |
|
From: <ap...@vh...> - 2006-04-28 19:23:25
|
Author: apevec Date: 2006-04-28 21:20:42 +0200 (Fri, 28 Apr 2006) New Revision: 1126 Modified: trunk/ccm-core/etc/java-libs.txt Log: correct Xerces jar filename PDFBox was missing Modified: trunk/ccm-core/etc/java-libs.txt =================================================================== --- trunk/ccm-core/etc/java-libs.txt 2006-04-28 18:01:20 UTC (rev 1125) +++ trunk/ccm-core/etc/java-libs.txt 2006-04-28 19:20:42 UTC (rev 1126) @@ -21,9 +21,10 @@ log4j.jar 1.2 APACHE http://www.apache.org/LICENSE.txt lucene-1.4.3.jar 1.4.3 APACHE http://www.apache.org/LICENSE.txt mail.jar 1.3.1 SUN http://java.sun.com/products/javamail/ +PDFBox-0.7.2-log4j.jar 0.7.2 BSD http://sourceforge.net/projects/pdfbox saxon.jar 6.5.2 MPL 1.0 http://www.mozilla.org/MPL/ Tidy.jar 04aug2000r7-dev http://prdownloads.sourceforge.net/jtidy/jtidy-04aug2000r7-dev.zip?download xalan.jar 2.7.0 APACHE http://www.apache.org/LICENSE.txt -xerces.jar 2.8.0 APACHE http://www.apache.org/LICENSE.txt +xercesImpl.jar 2.8.0 APACHE http://www.apache.org/LICENSE.txt |
|
From: <ap...@vh...> - 2006-04-28 18:04:12
|
Author: apevec Date: 2006-04-28 20:01:20 +0200 (Fri, 28 Apr 2006) New Revision: 1125 Modified: trunk/ccm-core/etc/java-libs.txt Log: syncing with reality Modified: trunk/ccm-core/etc/java-libs.txt =================================================================== --- trunk/ccm-core/etc/java-libs.txt 2006-04-28 17:57:48 UTC (rev 1124) +++ trunk/ccm-core/etc/java-libs.txt 2006-04-28 18:01:20 UTC (rev 1125) @@ -4,8 +4,8 @@ aspectjrt-1.0.5.jar 1.0.5 CPL 1.0 http://www.eclipse.org/legal/cpl-v10.html cactus-1.4.1.jar 1.4.1 APACHE http://www.apache.org/LICENSE.txt commons-beanutils.jar 1.6.1 APACHE http://www.apache.org/LICENSE.txt -commons-cli-1.0.jar 1.0 APACHE http://www.apache.org/LICENSE.txt -commons-codec-1.2.jar 1.2 APACHE http://www.apache.org/LICENSE.txt +commons-cli-1.0-beta-2-dev.jar 1.0 APACHE http://www.apache.org/LICENSE.txt +commons-codec-1.3.jar 1.3 APACHE http://www.apache.org/LICENSE.txt commons-collections-3.0.jar APACHE http://www.apache.org/LICENSE.txt commons-httpclient-2.0alpha1-20020606.jar APACHE http://www.apache.org/LICENSE.txt @@ -14,24 +14,16 @@ htmlarea 3.0-b BSD http://www.interactivetools.com/products/htmlarea/license.html i18n.jar 1.0 APACHE http://www.apache.org/LICENSE.txt iDoclet.jar 1.0 GPL http://www.gnu.org/copyleft/gpl.html -jaas.jar 1.0 SUN http://java.sun.com/products/jaas/index-10.html jakarta-oro-2.0.8.jar 2.0.8 APACHE http://www.apache.org/LICENSE.txt javacc.jar 3.2 BSD https://javacc.dev.java.net/ -jaxp.jar 1.1 SUN http://java.sun.com/xml/download.html -jce.jar 1.2.1 SUN http://java.sun.com/products/jce/jce121_license.txt - US_export_policy.jar - local_policy.jar - sunjce_provider.jar jdxslt.jar 1.5.5 MPL 1.1 http://www.mozilla.org/MPL/ jdom.jar beta 9 http://cvs.jdom.org/cgi-bin/viewcvs.cgi/jdom/LICENSE.txt log4j.jar 1.2 APACHE http://www.apache.org/LICENSE.txt lucene-1.4.3.jar 1.4.3 APACHE http://www.apache.org/LICENSE.txt mail.jar 1.3.1 SUN http://java.sun.com/products/javamail/ saxon.jar 6.5.2 MPL 1.0 http://www.mozilla.org/MPL/ -servlet.jar 2.2 APACHE http://www.apache.org/LICENSE.txt Tidy.jar 04aug2000r7-dev http://prdownloads.sourceforge.net/jtidy/jtidy-04aug2000r7-dev.zip?download -xalan.jar 2.1.0 APACHE http://www.apache.org/LICENSE.txt -xerces.jar 1.4.4 APACHE http://www.apache.org/LICENSE.txt -xsltc.jar 2.4.D1 APACHE http://www.apache.org/LICENSE.txt +xalan.jar 2.7.0 APACHE http://www.apache.org/LICENSE.txt +xerces.jar 2.8.0 APACHE http://www.apache.org/LICENSE.txt |
|
From: <ap...@vh...> - 2006-04-28 18:03:14
|
Author: apevec Date: 2006-04-28 19:57:48 +0200 (Fri, 28 Apr 2006) New Revision: 1124 Added: trunk/ccm-core/lib/PDFBox-0.7.2-log4j.jar trunk/ccm-core/lib/xercesImpl.jar trunk/ccm-core/lib/xml-apis.jar Removed: trunk/ccm-core/lib/PDFBox-0.7.1.jar trunk/ccm-core/lib/jaxp.jar trunk/ccm-core/lib/xerces.jar trunk/ccm-core/lib/xsltc.jar Modified: trunk/ccm-core/lib/xalan.jar Log: JAR updates: Xerces Xalan PDFBox Deleted: trunk/ccm-core/lib/PDFBox-0.7.1.jar Added: trunk/ccm-core/lib/PDFBox-0.7.2-log4j.jar =================================================================== (Binary files differ) Property changes on: trunk/ccm-core/lib/PDFBox-0.7.2-log4j.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/ccm-core/lib/jaxp.jar Modified: trunk/ccm-core/lib/xalan.jar =================================================================== (Binary files differ) Deleted: trunk/ccm-core/lib/xerces.jar Added: trunk/ccm-core/lib/xercesImpl.jar =================================================================== (Binary files differ) Property changes on: trunk/ccm-core/lib/xercesImpl.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ccm-core/lib/xml-apis.jar =================================================================== (Binary files differ) Property changes on: trunk/ccm-core/lib/xml-apis.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/ccm-core/lib/xsltc.jar |
|
From: <ap...@vh...> - 2006-04-27 16:42:08
|
Author: apevec
Date: 2006-04-27 18:39:12 +0200 (Thu, 27 Apr 2006)
New Revision: 1123
Modified:
trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
Log:
add mimeType
Modified: trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
===================================================================
--- trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-27 15:14:20 UTC (rev 1122)
+++ trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-27 16:39:12 UTC (rev 1123)
@@ -21,6 +21,7 @@
<xrd:property name="/object/auditing"/>
<xrd:property name="/object/auditing/creationUser"/>
<xrd:property name="/object/dublinCore"/>
+ <xrd:property name="/object/mimeType"/>
</xrd:associations>
</xrd:adapter>
</xrd:context>
|
|
From: <ap...@vh...> - 2006-04-27 15:16:57
|
Author: apevec
Date: 2006-04-27 17:14:20 +0200 (Thu, 27 Apr 2006)
New Revision: 1122
Modified:
trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
Log:
add creationUser in auditing XML output
Modified: trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
===================================================================
--- trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-26 21:54:09 UTC (rev 1121)
+++ trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-27 15:14:20 UTC (rev 1122)
@@ -19,6 +19,7 @@
</xrd:attributes>
<xrd:associations rule="include">
<xrd:property name="/object/auditing"/>
+ <xrd:property name="/object/auditing/creationUser"/>
<xrd:property name="/object/dublinCore"/>
</xrd:associations>
</xrd:adapter>
|
|
From: <ap...@vh...> - 2006-04-26 21:56:40
|
Author: apevec
Date: 2006-04-26 23:54:09 +0200 (Wed, 26 Apr 2006)
New Revision: 1121
Modified:
trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
trunk/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java
Log:
enable standalone FA XML output
Modified: trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml
===================================================================
--- trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-26 21:17:49 UTC (rev 1120)
+++ trunk/ccm-cms-assets-fileattachment/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/FileAttachment.xml 2006-04-26 21:54:09 UTC (rev 1121)
@@ -17,6 +17,10 @@
<xrd:property name="/object/language"/>
<xrd:property name="/object/content"/>
</xrd:attributes>
+ <xrd:associations rule="include">
+ <xrd:property name="/object/auditing"/>
+ <xrd:property name="/object/dublinCore"/>
+ </xrd:associations>
</xrd:adapter>
</xrd:context>
Modified: trunk/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java
===================================================================
--- trunk/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java 2006-04-26 21:17:49 UTC (rev 1120)
+++ trunk/ccm-cms-assets-fileattachment/src/com/arsdigita/cms/contentassets/FileAttachmentInitializer.java 2006-04-26 21:54:09 UTC (rev 1121)
@@ -18,10 +18,12 @@
import com.arsdigita.cms.contenttypes.ContentAssetInitializer;
import com.arsdigita.cms.contentassets.FileAttachment;
import com.arsdigita.cms.contentassets.ui.FileAttachmentsStep;
+import com.arsdigita.domain.xml.TraversalHandler;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.kernel.URLService;
import com.arsdigita.runtime.LegacyInitEvent;
+import com.arsdigita.xml.XML;
/**
* Initializer
@@ -77,5 +79,9 @@
URLService.registerFinder(
FileAttachment.BASE_DATA_OBJECT_TYPE,
new FileAttachmentURLFinder());
+
+ // we might need to output FA XML standalone
+ XML.parseResource(getTraversalXML(),
+ new TraversalHandler());
}
}
|
|
From: <ap...@vh...> - 2006-04-26 21:20:30
|
Author: apevec
Date: 2006-04-26 23:17:49 +0200 (Wed, 26 Apr 2006)
New Revision: 1120
Modified:
trunk/tools/tools/lib/CCM/Server/Tomcat.pm
Log:
always append logfiles, to avoid getting sparse files
Modified: trunk/tools/tools/lib/CCM/Server/Tomcat.pm
===================================================================
--- trunk/tools/tools/lib/CCM/Server/Tomcat.pm 2006-04-25 13:47:33 UTC (rev 1119)
+++ trunk/tools/tools/lib/CCM/Server/Tomcat.pm 2006-04-26 21:17:49 UTC (rev 1120)
@@ -101,8 +101,8 @@
if (@_) {
$command .= " " . join(" ", @_);
}
- $command .= " > " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stdout.log');
- $command .= " 2> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stderr.log');
+ $command .= " >> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stdout.log');
+ $command .= " 2>> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stderr.log');
$command .= " &";
CCM::Util::setuser();
$self->runExec($command);
@@ -117,8 +117,8 @@
if (@_) {
$command .= " " . join(" ", @_);
}
- $command .= " > " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stdout.log');
- $command .= " 2> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stderr.log');
+ $command .= " >> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stdout.log');
+ $command .= " 2>> " . File::Spec->catfile($self->getCCMHome(), 'logs', 'catalina-stderr.log');
CCM::Util::setuser();
$self->runExec($command);
}
|
|
From: <ssk...@vh...> - 2006-04-25 13:50:36
|
Author: sskracic Date: 2006-04-25 15:47:33 +0200 (Tue, 25 Apr 2006) New Revision: 1119 Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql Log: Yeah, Postgres is weird, it needs 'commit' to persist DDL changes as well. Modified: trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql =================================================================== --- trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql 2006-04-24 02:57:44 UTC (rev 1118) +++ trunk/ccm-ldn-dublin/sql/ccm-ldn-dublin/upgrade/postgres-6.3.0-6.3.1.sql 2006-04-25 13:47:33 UTC (rev 1119) @@ -1,8 +1,12 @@ -alter table ldn_dublin_core_items add - item_id integer constraint ldn_dub_cor_ite_ite_id_f_f7q6_ references cms_items(item_id); -update ldn_dublin_core_items - set item_id = dcm.item_id - from LDN_DUBLIN_CORE_ITEM_MAP dcm - where dcm.dublin_id=ldn_dublin_core_items.dublin_id; +begin; --- drop table ldn_dublin_core_item_map; + alter table ldn_dublin_core_items add + item_id integer constraint ldn_dub_cor_ite_ite_id_f_f7q6_ references cms_items(item_id); + update ldn_dublin_core_items + set item_id = dcm.item_id + from LDN_DUBLIN_CORE_ITEM_MAP dcm + where dcm.dublin_id=ldn_dublin_core_items.dublin_id; + + -- drop table ldn_dublin_core_item_map; + +commit; |
|
From: <ap...@vh...> - 2006-04-24 03:00:15
|
Author: apevec
Date: 2006-04-24 04:57:44 +0200 (Mon, 24 Apr 2006)
New Revision: 1118
Modified:
trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
Log:
cleanup
Modified: trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
===================================================================
--- trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java 2006-04-24 01:34:37 UTC (rev 1117)
+++ trunk/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java 2006-04-24 02:57:44 UTC (rev 1118)
@@ -18,23 +18,15 @@
package com.arsdigita.london.navigation.ui.portlet;
-import java.sql.CallableStatement;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Date;
-
import com.arsdigita.bebop.PageState;
-import com.arsdigita.xml.Element;
import com.arsdigita.bebop.portal.AbstractPortletRenderer;
+import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
+import com.arsdigita.london.navigation.DataCollectionRenderer;
+import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.SessionManager;
import com.arsdigita.util.StringUtils;
+import com.arsdigita.xml.Element;
-import com.arsdigita.london.navigation.DataCollectionRenderer;
-import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
-
public class ObjectListPortletRenderer extends AbstractPortletRenderer {
private ObjectListPortlet m_portlet;
@@ -72,16 +64,10 @@
Element content = renderer.generateXML(objects, getPageNumber());
parent.addContent(content);
-
- generateFooter(parent);
}
protected int getPageNumber() {
return 1;
}
- protected void generateFooter(Element parent) {
- // override to generate additional XML output
- }
-
}
|
18 messages has been excluded from this view by a project administrator.
