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: <mb...@re...> - 2005-03-16 17:27:31
|
Author: mbooth
Date: 2005-03-16 18:24:50 +0100 (Wed, 16 Mar 2005)
New Revision: 401
Modified:
releases/1.0.2/ccm-ldn-terms/src/WEB-INF/resources/terms-adapters.xml
releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.upgrade
Log:
Finish removing terms->atoz dependency
Modified: releases/1.0.2/ccm-ldn-terms/src/WEB-INF/resources/terms-adapters.xml
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/WEB-INF/resources/terms-adapters.xml 2005-03-16 16:08:02 UTC (rev 400)
+++ releases/1.0.2/ccm-ldn-terms/src/WEB-INF/resources/terms-adapters.xml 2005-03-16 17:24:50 UTC (rev 401)
@@ -4,16 +4,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
- <xrd:context name="com.arsdigita.london.atoz.ui.admin.ProviderDetails">
- <xrd:adapter objectType="com.arsdigita.london.terms.atoz.DomainProvider">
- <xrd:attributes rule="exclude">
- <xrd:property name="/object/id"/>
- <xrd:property name="/object/defaultDomainClass"/>
- <xrd:property name="/object/displayName"/>
- </xrd:attributes>
- </xrd:adapter>
- </xrd:context>
-
<xrd:context name="com.arsdigita.london.terms.ui.AbstractTermDetails">
<xrd:adapter objectType="com.arsdigita.london.terms.Term">
<xrd:attributes rule="exclude">
Modified: releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.upgrade
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.upgrade 2005-03-16 16:08:02 UTC (rev 400)
+++ releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.upgrade 2005-03-16 17:24:50 UTC (rev 401)
@@ -3,4 +3,7 @@
<script sql="ccm-ldn-terms/upgrade/::database::-1.0.0-1.0.1.sql"/>
<script class="com.arsdigita.london.terms.upgrade.Upgrade100to101"/>
</version>
+ <version from="1.0.1" to="1.0.2">
+ <script sql="ccm-ldn-terms/upgrade/::database::-1.0.1-1.0.2.sql"/>
+ </version>
</upgrade>
|
|
From: <ssk...@re...> - 2005-03-16 16:10:21
|
Author: sskracic Date: 2005-03-16 17:08:02 +0100 (Wed, 16 Mar 2005) New Revision: 400 Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java Log: Icorporated patch 1158289 from aplaws.sf.net https://sourceforge.net/tracker/index.php?func=detail&aid=1158289&group_id=71505&atid=531527 Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java =================================================================== --- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java 2005-03-16 15:29:57 UTC (rev 399) +++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java 2005-03-16 16:08:02 UTC (rev 400) @@ -414,6 +414,18 @@ } /** + * Retrieves the collection of terms in this domain + * which are associated with the object directly or indirectly. + * @param obj the object to get terms for + * @return the collection of terms for this object + */ + public DomainCollection getAllTerms(ACSObject obj) { + DomainCollection terms = getTerms(); + terms.addEqualsFilter("model.roTransSubcats.childObjects.id", obj.getID()); + return terms; + } + + /** * Ensure that the domain's terms are orphaned. */ protected void beforeDelete() { |
|
From: <fa...@re...> - 2005-03-16 15:32:30
|
Author: fabrice
Date: 2005-03-16 16:29:57 +0100 (Wed, 16 Mar 2005)
New Revision: 399
Modified:
releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
Log:
Correcting parameter names
Modified: releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java
===================================================================
--- releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java 2005-03-16 15:29:39 UTC (rev 398)
+++ releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/WorkspaceConfig.java 2005-03-16 15:29:57 UTC (rev 399)
@@ -59,7 +59,7 @@
PageLayout.FORMAT_THREE_COLUMNS);
m_createUserWorkspaces = new BooleanParameter
- ("com.runtimecollective.portal.create_user_workspaces",
+ ("com.arsdigita.portal.create_user_workspaces",
Parameter.REQUIRED,
Boolean.TRUE);
|
|
From: <fa...@re...> - 2005-03-16 15:32:13
|
Author: fabrice Date: 2005-03-16 16:29:39 +0100 (Wed, 16 Mar 2005) New Revision: 398 Modified: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java Log: Correcting parameter names Modified: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java =================================================================== --- releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java 2005-03-16 15:29:11 UTC (rev 397) +++ releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/ContentList.java 2005-03-16 15:29:39 UTC (rev 398) @@ -62,7 +62,7 @@ * <ul> * <li> add the following to 'web/package/navigation/templates/default.jsp':<br> * <define:component name="contentList" - * classname="com.runtimecollective.cms.dispatcher.ContentList" /> + * classname="com.arsdigita.cms.dispatcher.ContentList" /> * <li> add the following to 'web/__ccm__/apps/navigation/xsl/index.xsl':<br> * <xsl:include href="content-lists.xsl" /> * </ul> @@ -71,7 +71,7 @@ * <ul> * <li> add the following to 'web/package/content-section/templates/default/item.jsp':<br> * <define:component name="contentList" - * classname="com.runtimecollective.cms.dispatcher.ContentList" /> + * classname="com.arsdigita.cms.dispatcher.ContentList" /> * <li> add the following to 'web/__ccm__/apps/content-section/xsl/index.xsl':<br> * <xsl:include href="../../navigation/xsl/content-lists.xsl" /> * </ul> |
|
From: <fa...@re...> - 2005-03-16 15:31:17
|
Author: fabrice
Date: 2005-03-16 16:29:11 +0100 (Wed, 16 Mar 2005)
New Revision: 397
Modified:
releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties
Log:
Correcting parameter names
Modified: releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java 2005-03-16 15:28:45 UTC (rev 396)
+++ releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java 2005-03-16 15:29:11 UTC (rev 397)
@@ -35,7 +35,7 @@
public final static String versionId = "$Id$";
private final Parameter m_overrideAnavFromLGCLMappings = new BooleanParameter
- ("com.runtimecollective.aplaws.override_anav_from_lgcl_mappings", Parameter.OPTIONAL, new Boolean(false));
+ ("com.arsdigita.aplaws.override_anav_from_lgcl_mappings", Parameter.OPTIONAL, new Boolean(false));
public AplawsConfig() {
register(m_overrideAnavFromLGCLMappings);
Modified: releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties 2005-03-16 15:28:45 UTC (rev 396)
+++ releases/1.0.2/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig_parameter.properties 2005-03-16 15:29:11 UTC (rev 397)
@@ -1,4 +1,4 @@
-com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.title=Whether LGCL categorisation should overwrite (delete) ANav categorisation (mappings)
-com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.purpose=If set to true, assigning one/some LGCL categories to an item will erase its existing ANav categories (and replace them with ANav categories linked to the LGCL ones, if any)
-com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.example=true|false
-com.runtimecollective.aplaws.override_anav_from_lgcl_mappings.format=[boolean]
+com.arsdigita.aplaws.override_anav_from_lgcl_mappings.title=Whether LGCL categorisation should overwrite (delete) ANav categorisation (mappings)
+com.arsdigita.aplaws.override_anav_from_lgcl_mappings.purpose=If set to true, assigning one/some LGCL categories to an item will erase its existing ANav categories (and replace them with ANav categories linked to the LGCL ones, if any)
+com.arsdigita.aplaws.override_anav_from_lgcl_mappings.example=true|false
+com.arsdigita.aplaws.override_anav_from_lgcl_mappings.format=[boolean]
|
|
From: <fa...@re...> - 2005-03-16 15:30:47
|
Author: fabrice Date: 2005-03-16 16:28:45 +0100 (Wed, 16 Mar 2005) New Revision: 396 Modified: releases/1.0.2/ccm-core/src/com/arsdigita/ui/NowDateTime.java Log: Correcting parameter names Modified: releases/1.0.2/ccm-core/src/com/arsdigita/ui/NowDateTime.java =================================================================== --- releases/1.0.2/ccm-core/src/com/arsdigita/ui/NowDateTime.java 2005-03-16 15:28:22 UTC (rev 395) +++ releases/1.0.2/ccm-core/src/com/arsdigita/ui/NowDateTime.java 2005-03-16 15:28:45 UTC (rev 396) @@ -43,7 +43,7 @@ * <p> * To activate this component in a jsp, add the following:<br> * <define:component name="contentList" - * classname="com.runtimecollective.ui.NowDateTime" /> + * classname="com.arsdigita.ui.NowDateTime" /> * </ul> * * @version $Revision: 1.2 $ $Date: 2005/01/07 18:48:45 $ |
|
From: <fa...@re...> - 2005-03-16 15:30:25
|
Author: fabrice
Date: 2005-03-16 16:28:22 +0100 (Wed, 16 Mar 2005)
New Revision: 395
Modified:
releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java
Log:
Correcting parameter names
Modified: releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java
===================================================================
--- releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java 2005-03-16 14:48:19 UTC (rev 394)
+++ releases/1.0.2/ccm-cms/src/com/arsdigita/cms/ui/FolderContent.java 2005-03-16 15:28:22 UTC (rev 395)
@@ -62,11 +62,11 @@
* <p>
* To use this component, you can copy this example:<br>
* <define:component name="folderContent"
- * classname="com.runtimecollective.cms.ui.FolderContent" />
+ * classname="com.arsdigita.cms.ui.FolderContent" />
* <jsp:scriptlet><br>
- * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setContentSection("content");<br>
- * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setFolderName("myfolder");<br>
- * ((com.runtimecollective.cms.ui.FolderContent) folderContent).setRandomOne("true");<br>
+ * ((com.arsdigita.cms.ui.FolderContent) folderContent).setContentSection("content");<br>
+ * ((com.arsdigita.cms.ui.FolderContent) folderContent).setFolderName("myfolder");<br>
+ * ((com.arsdigita.cms.ui.FolderContent) folderContent).setRandomOne("true");<br>
* <jsp:scriptlet>
* <p>
*
|
|
From: <mb...@re...> - 2005-03-16 14:50:23
|
Author: mbooth Date: 2005-03-16 15:48:19 +0100 (Wed, 16 Mar 2005) New Revision: 394 Modified: releases/1.0.2/ccm-cms-types-htmlform/application.xml Log: Update versions of ccm-core and ccm-cms Modified: releases/1.0.2/ccm-cms-types-htmlform/application.xml =================================================================== --- releases/1.0.2/ccm-cms-types-htmlform/application.xml 2005-03-16 14:47:19 UTC (rev 393) +++ releases/1.0.2/ccm-cms-types-htmlform/application.xml 2005-03-16 14:48:19 UTC (rev 394) @@ -8,8 +8,8 @@ xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> - <ccm:requires name="ccm-core" version="6.1.0"/> - <ccm:requires name="ccm-cms" version="6.1.0"/> + <ccm:requires name="ccm-core" version="6.1.1"/> + <ccm:requires name="ccm-cms" version="6.1.1"/> <ccm:requires name="ccm-cms-types-article" version="6.1.0"/> </ccm:dependencies> |
|
From: <mb...@re...> - 2005-03-16 14:49:39
|
Author: mbooth
Date: 2005-03-16 15:47:19 +0100 (Wed, 16 Mar 2005)
New Revision: 393
Added:
releases/1.0.2/tools/rpms/ccm-java/
releases/1.0.2/tools/rpms/ccm-java/SOURCES/
releases/1.0.2/tools/rpms/ccm-java/SOURCES/ccm-java.sh
releases/1.0.2/tools/rpms/ccm-java/ccm-java.spec
releases/1.0.2/tools/rpms/ccm-java/rollingbuild.sh
Modified:
releases/1.0.2/tools/misc/build-all.sh
Log:
Added ccm-java
Modified: releases/1.0.2/tools/misc/build-all.sh
===================================================================
--- releases/1.0.2/tools/misc/build-all.sh 2005-03-16 14:46:24 UTC (rev 392)
+++ releases/1.0.2/tools/misc/build-all.sh 2005-03-16 14:47:19 UTC (rev 393)
@@ -235,7 +235,7 @@
export RPM_DIR=$HOMETOPDIR
# Build the build tools
-for i in httpunit junit junitperf servlet
+for i in ccm-java httpunit junit junitperf servlet
do
(
set -e
@@ -409,6 +409,7 @@
cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
cp $HOMERPMDIR/junitperf-1.8-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
cp $HOMERPMDIR/httpunit-1.5.4-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
+ cp $HOMERPMDIR/ccm-java-1.0-1.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
cp $HOMERPMDIR/servlet-2.3-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
# cp $HOMERPMDIR/servlet-2.2-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
@@ -432,6 +433,7 @@
cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
cp $HOMESRPMDIR/junitperf-1.8-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
cp $HOMESRPMDIR/httpunit-1.5.4-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
+ cp $HOMESRPMDIR/ccm-java-1.0-1.src.rpm $BUILD_HOME/dist/runtime/SRPMS
cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
cp $HOMESRPMDIR/servlet-2.3-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
# cp $HOMERPMDIR/servlet-2.2-1ccm.src.rpm $BUILD_HOME/dist/runtime/RPMS
Property changes on: releases/1.0.2/tools/rpms/ccm-java
___________________________________________________________________
Name: svn:ignore
+ BUILD
RPMS
SRPMS
Added: releases/1.0.2/tools/rpms/ccm-java/SOURCES/ccm-java.sh
===================================================================
--- releases/1.0.2/tools/rpms/ccm-java/SOURCES/ccm-java.sh 2005-03-16 14:46:24 UTC (rev 392)
+++ releases/1.0.2/tools/rpms/ccm-java/SOURCES/ccm-java.sh 2005-03-16 14:47:19 UTC (rev 393)
@@ -0,0 +1,12 @@
+. /etc/sysconfig/ccm-java
+
+for jar in "$ORACLE" "$POSTGRES"; do
+ case "$CLASSPATH" in
+ *"$jar"*) ;;
+ "") CLASSPATH=$jar ;;
+ *) CLASSPATH=${CLASSPATH}:$jar ;;
+ esac
+done
+
+export CLASSPATH
+export JAVA_HOME
Added: releases/1.0.2/tools/rpms/ccm-java/ccm-java.spec
===================================================================
--- releases/1.0.2/tools/rpms/ccm-java/ccm-java.spec 2005-03-16 14:46:24 UTC (rev 392)
+++ releases/1.0.2/tools/rpms/ccm-java/ccm-java.spec 2005-03-16 14:47:19 UTC (rev 393)
@@ -0,0 +1,70 @@
+Summary: Java related environment variables for CCM
+Name: ccm-java
+Version: 1.0
+Release: 1
+Group: Applications/Internet/CCM
+License: LGPL
+Source0: ccm-java.sh
+URL: http://aplaws.redhat.com/
+Requires: /usr/bin/locate
+
+BuildArchitectures: noarch
+BuildRoot: %{_tmppath}/%{name}-root
+
+%description
+A convenience profile script for setting JAVA_HOME and adding jdbc drivers for
+oracle and postgres if they are present.
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/etc/profile.d
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+
+install -m 644 %{SOURCE0} $RPM_BUILD_ROOT/etc/profile.d
+touch $RPM_BUILD_ROOT/etc/sysconfig/ccm-java
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+. /etc/sysconfig/ccm-java
+
+if [ -z "$JAVA_HOME" ]; then
+ [ -d /usr/lib/jvm/java ] && JAVA_HOME=/usr/lib/jvm/java
+fi
+
+if [ -z "$ORACLE" ]; then
+ if [ ! -z "$ORACLE_HOME" ]; then
+ ORACLE=$ORACLE_HOME/jdbc/lib/classes12.jar
+ elif rpm -q oracle-instantclient-basic > /dev/null; then
+ ORACLE=`rpm -ql oracle-instantclient-basic | \
+ grep classes12.jar | sort | tail -n 1`
+ else
+ ORACLE=`/usr/bin/locate classes12.jar | head -n 1`
+ fi
+fi
+
+if [ -z "$POSTGRES" ]; then
+ if rpm -q postgresql-jdbc > /dev/null; then
+ POSTGRES=`rpm -ql postgresql-jdbc | \
+ grep "jdbc3.jar$" | sort | tail -n 1`
+ elif rpm -q rh-postgresql-jdbc > /dev/null; then
+ POSTGRES=`rpm -ql rh-postgresql-jdbc | sort | tail -n 1`
+ fi
+fi
+
+cat > /etc/sysconfig/ccm-java <<EOF
+JAVA_HOME=$JAVA_HOME
+ORACLE=$ORACLE
+POSTGRES=$POSTGRES
+EOF
+
+%files
+%defattr(-,root,root)
+/etc/profile.d/ccm-java.sh
+%config(noreplace) /etc/sysconfig/ccm-java
+
+%changelog
+* Wed Mar 16 2005 Matthew Booth <mb...@re...> 1.0-1
+- initial build
Added: releases/1.0.2/tools/rpms/ccm-java/rollingbuild.sh
===================================================================
--- releases/1.0.2/tools/rpms/ccm-java/rollingbuild.sh 2005-03-16 14:46:24 UTC (rev 392)
+++ releases/1.0.2/tools/rpms/ccm-java/rollingbuild.sh 2005-03-16 14:47:19 UTC (rev 393)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ -n "$RPM_DIR" ]
+then
+ rpmbuild --define "_topdir $RPM_DIR" --define "_sourcedir `pwd`/SOURCES" --clean -ba *.spec
+else
+ mkdir -p BUILD SRPMS RPMS/noarch
+ rpmbuild --define "_sourcedir `pwd`/SOURCES" --clean -ba *.spec
+fi
Property changes on: releases/1.0.2/tools/rpms/ccm-java/rollingbuild.sh
___________________________________________________________________
Name: svn:executable
+ *
|
|
From: <mb...@re...> - 2005-03-16 14:48:31
|
Author: mbooth Date: 2005-03-16 15:46:24 +0100 (Wed, 16 Mar 2005) New Revision: 392 Added: users/mbooth/projects/aplaws-build/complete.txt Log: Applications to build for complete bundle Added: users/mbooth/projects/aplaws-build/complete.txt =================================================================== --- users/mbooth/projects/aplaws-build/complete.txt 2005-03-16 14:45:36 UTC (rev 391) +++ users/mbooth/projects/aplaws-build/complete.txt 2005-03-16 14:46:24 UTC (rev 392) @@ -0,0 +1,45 @@ +ccm-core +ccm-cms +ccm-cms-assets-relatedlink +ccm-cms-assets-fileattachment +ccm-ldn-util +ccm-ldn-atoz +ccm-ldn-terms +ccm-ldn-navigation +ccm-ldn-dublin +ccm-cms-types-contact +ccm-cms-types-esdservice +ccm-cms-types-article +ccm-cms-types-filestorageitem +ccm-cms-types-mparticle +ccm-cms-types-newsitem +ccm-cms-types-pressrelease +ccm-cms-types-formsectionitem +ccm-cms-types-formitem +ccm-cms-types-inlinesite +ccm-ldn-xmlfeed +ccm-ldn-rss +ccm-forum +ccm-ldn-portal +ccm-ldn-search +ccm-ldn-shortcuts +ccm-ldn-subsite +ccm-ldn-aplaws +ccm-ldn-importer +ccm-ldn-theme +ccm-auth-http +ccm-cms-types-address +ccm-cms-types-agenda +ccm-cms-types-bookmark +ccm-cms-types-event +ccm-cms-types-faqitem +ccm-cms-types-glossaryitem +ccm-cms-types-job +ccm-cms-types-legalnotice +ccm-cms-types-minutes +ccm-cms-types-organization +ccm-cms-types-service +ccm-cms-types-siteproxy +ccm-ldn-exporter +ccm-ldn-image-step +ccm-simplesurvey |
|
From: <mb...@re...> - 2005-03-16 14:46:07
|
Author: mbooth
Date: 2005-03-16 15:43:49 +0100 (Wed, 16 Mar 2005)
New Revision: 390
Removed:
releases/1.0.2/tools/tools/lib/security/
Modified:
releases/1.0.2/tools/tools/ccm-tools.spec.in
releases/1.0.2/tools/tools/configure.in
releases/1.0.2/tools/tools/lib/CCM/Runtime.pm
releases/1.0.2/tools/tools/lib/Makefile.am
Log:
Remove JCE and JAAS libraries as these are provided by 1.4 JDK
Modified: releases/1.0.2/tools/tools/ccm-tools.spec.in
===================================================================
--- releases/1.0.2/tools/tools/ccm-tools.spec.in 2005-03-16 14:15:01 UTC (rev 389)
+++ releases/1.0.2/tools/tools/ccm-tools.spec.in 2005-03-16 14:43:49 UTC (rev 390)
@@ -157,7 +157,6 @@
%dir /usr/share/%{name}/lib/CCM
/usr/share/%{name}/lib/CCM/*.pm
%dir /usr/share/%{name}/lib/CCM/Server
-/usr/share/%{name}/lib/security
%{ccmhome}
%attr(0755,root,root) /usr/bin/*
Modified: releases/1.0.2/tools/tools/configure.in
===================================================================
--- releases/1.0.2/tools/tools/configure.in 2005-03-16 14:15:01 UTC (rev 389)
+++ releases/1.0.2/tools/tools/configure.in 2005-03-16 14:43:49 UTC (rev 390)
@@ -3,7 +3,7 @@
AC_INIT(ccm-tools.spec.in)
-VERSION=2.1.2
+VERSION=2.1.3
RELEASE=1
AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
@@ -26,7 +26,6 @@
etc/Makefile
etc/ccm-tools/Makefile
lib/Makefile
- lib/security/Makefile
lib/CCM/Makefile
lib/CCM/Server/Makefile
server/Makefile
Modified: releases/1.0.2/tools/tools/lib/CCM/Runtime.pm
===================================================================
--- releases/1.0.2/tools/tools/lib/CCM/Runtime.pm 2005-03-16 14:15:01 UTC (rev 389)
+++ releases/1.0.2/tools/tools/lib/CCM/Runtime.pm 2005-03-16 14:43:49 UTC (rev 390)
@@ -204,8 +204,7 @@
$ENV{'CCM_JRE_EXT'} :
"-Djava.ext.dirs=" . CCM::Util::catpath (File::Spec->catdir(&getJavaHome(), 'jre', 'lib', 'ext'),
File::Spec->catdir(&getJavaHome(), 'lib', 'ext'));
- foreach (File::Spec->catdir($ccm_home, 'webapps', 'WEB-INF', 'system'),
- File::Spec->catdir($ccm_tools_home, 'lib', 'security')) {
+ foreach (File::Spec->catdir($ccm_home, 'webapps', 'WEB-INF', 'system')) {
$ccm_jre_ext = CCM::Util::catpath($ccm_jre_ext, $_) if (-d $_);
}
my $log4j = defined $ENV{'LOG4J_PROPERTIES'} ? $ENV{'LOG4J_PROPERTIES'} : "";
Modified: releases/1.0.2/tools/tools/lib/Makefile.am
===================================================================
--- releases/1.0.2/tools/tools/lib/Makefile.am 2005-03-16 14:15:01 UTC (rev 389)
+++ releases/1.0.2/tools/tools/lib/Makefile.am 2005-03-16 14:43:49 UTC (rev 390)
@@ -2,6 +2,6 @@
AUTOMAKE_OPTIONS = foreign no-dependencies 1.4
-SUBDIRS = security CCM
+SUBDIRS = CCM
# End of files
|
|
From: <fa...@re...> - 2005-03-16 14:17:05
|
Author: fabrice
Date: 2005-03-16 15:15:01 +0100 (Wed, 16 Mar 2005)
New Revision: 389
Modified:
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
Log:
Moving two init lines where they belong, adding dependencies
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java 2005-03-16 14:12:41 UTC (rev 388)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java 2005-03-16 14:15:01 UTC (rev 389)
@@ -31,6 +31,9 @@
import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter;
import com.arsdigita.persistence.pdl.ManifestSource;
+import com.arsdigita.london.navigation.ApplicationNavigationModel;
+import com.arsdigita.london.navigation.DefaultNavigationModel;
+
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.CompoundInitializer;
@@ -86,6 +89,9 @@
)
);
+ ApplicationNavigationModel.register(AtoZ.class.getName(),
+ new DefaultNavigationModel());
+
AtoZ.getConfig().registerProviderType(
new AtoZProviderType(
"ESD Toolkit Domain Provider",
|
|
From: <fa...@re...> - 2005-03-16 14:14:45
|
Author: fabrice
Date: 2005-03-16 15:12:41 +0100 (Wed, 16 Mar 2005)
New Revision: 388
Modified:
releases/1.0.2/ccm-ldn-portal/application.xml
releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java
Log:
Moving two init lines where they belong, adding dependencies
Modified: releases/1.0.2/ccm-ldn-portal/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-portal/application.xml 2005-03-16 14:09:25 UTC (rev 387)
+++ releases/1.0.2/ccm-ldn-portal/application.xml 2005-03-16 14:12:41 UTC (rev 388)
@@ -10,9 +10,10 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
- <ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-forum" version="1.4.1"/>
+ <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
<ccm:requires name="ccm-ldn-rss" version="1.4.1"/>
+ <ccm:requires name="ccm-ldn-util" version="1.4.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java
===================================================================
--- releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java 2005-03-16 14:09:25 UTC (rev 387)
+++ releases/1.0.2/ccm-ldn-portal/src/com/arsdigita/london/portal/Initializer.java 2005-03-16 14:12:41 UTC (rev 388)
@@ -46,6 +46,9 @@
import com.arsdigita.kernel.ui.ResourceConfigFormSection;
import com.arsdigita.bebop.RequestLocal;
+import com.arsdigita.london.navigation.ApplicationNavigationModel;
+import com.arsdigita.london.navigation.DefaultNavigationModel;
+
import com.arsdigita.london.portal.portlet.TimeOfDayPortlet;
import com.arsdigita.london.portal.portlet.ContentDirectoryPortlet;
import com.arsdigita.london.portal.portlet.FreeformHTMLPortlet;
@@ -53,7 +56,6 @@
import com.arsdigita.london.portal.portlet.RSSFeedPortlet;
import com.arsdigita.london.portal.portlet.ApplicationDirectoryPortlet;
import com.arsdigita.london.portal.portlet.WorkspaceDirectoryPortlet;
-
import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditor;
import com.arsdigita.london.portal.ui.portlet.RSSFeedPortletEditorForm;
import com.arsdigita.london.portal.ui.portlet.FreeformHTMLPortletEditor;
@@ -258,5 +260,7 @@
}
};
+ ApplicationNavigationModel.register(Workspace.class.getName(),
+ new DefaultNavigationModel());
}
}
|
|
From: <fa...@re...> - 2005-03-16 14:12:22
|
Author: fabrice
Date: 2005-03-16 15:09:25 +0100 (Wed, 16 Mar 2005)
New Revision: 387
Modified:
releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java
Log:
Moving two init lines where they belong, adding dependencies
Modified: releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java 2005-03-16 13:59:03 UTC (rev 386)
+++ releases/1.0.2/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java 2005-03-16 14:09:25 UTC (rev 387)
@@ -44,9 +44,6 @@
static {
register(ContentSection.BASE_DATA_OBJECT_TYPE, new CMSNavigationModel());
register(Navigation.BASE_DATA_OBJECT_TYPE, new DefaultNavigationModel());
- // use strings not to introduce dependencies
- register("com.arsdigita.london.atoz.AtoZ", new DefaultNavigationModel());
- register("com.arsdigita.london.portal.Workspace", new DefaultNavigationModel());
}
public ACSObject getObject() {
|
|
From: <mb...@re...> - 2005-03-16 14:01:59
|
Author: mbooth
Date: 2005-03-16 14:59:03 +0100 (Wed, 16 Mar 2005)
New Revision: 386
Modified:
releases/1.0.2/ccm-ldn-atoz/application.xml
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java
Log:
Reintroduce change reverted @266
Modified: releases/1.0.2/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/application.xml 2005-03-16 13:13:19 UTC (rev 385)
+++ releases/1.0.2/ccm-ldn-atoz/application.xml 2005-03-16 13:59:03 UTC (rev 386)
@@ -11,6 +11,8 @@
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
<ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
+ <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
+ <ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java 2005-03-16 13:13:19 UTC (rev 385)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java 2005-03-16 13:59:03 UTC (rev 386)
@@ -28,9 +28,22 @@
import com.arsdigita.categorization.Category;
+import com.arsdigita.london.navigation.Navigation;
+import com.arsdigita.london.navigation.GenericNavigationModel;
+import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.london.subsite.SubsiteContext;
+import com.arsdigita.london.subsite.Subsite;
+import com.arsdigita.london.subsite.Site;
+
+import com.arsdigita.web.Application;
+
+import org.apache.log4j.Logger;
+
public class AtoZCategoryProvider extends AtoZProvider {
+ private static final Logger s_log = Logger.getLogger(AtoZCategoryProvider.class);
+
public static final String BASE_DATA_OBJECT_TYPE
= "com.arsdigita.london.atoz.AtoZCategoryProvider";
@@ -42,6 +55,9 @@
public static final String ATOMIC_ENTRIES =
"com.arsdigita.london.atoz.getAtomicCategoryEntries";
+ public static final String ATOMIC_ENTRIES_FOR_ROOT_CATEGORY =
+ "com.arsdigita.london.atoz.getAtomicCategoryEntriesForRootCategory";
+
public static final String COMPOUND_ENTRIES =
"com.arsdigita.london.atoz.getCompoundCategoryEntries";
@@ -77,6 +93,9 @@
return provider;
}
+
+
+
protected void setup(String title,
String description,
boolean isCompound) {
@@ -124,9 +143,20 @@
}
public DataQuery getAtomicEntries() {
- DataQuery cats = SessionManager.getSession()
- .retrieveQuery(ATOMIC_ENTRIES);
- cats.setParameter("providerID", getID());
+ DataQuery cats = null;
+ SubsiteContext subsiteContext = Subsite.getContext();
+ boolean useSubsiteSpecificNavigationCategory = AtoZ.getConfig().useSubsiteSpecificNavigationCategory(); // configured using ccm set
+ boolean hasSite = subsiteContext.hasSite();
+ if (hasSite && useSubsiteSpecificNavigationCategory) {
+ Site site = subsiteContext.getSite();
+ Category root = site.getRootCategory();
+ cats = SessionManager.getSession().retrieveQuery(ATOMIC_ENTRIES_FOR_ROOT_CATEGORY);
+ cats.setParameter("providerID", getID());
+ cats.setParameter("rootCategoryID", root.getID());
+ } else {
+ cats = SessionManager.getSession().retrieveQuery(ATOMIC_ENTRIES);
+ cats.setParameter("providerID", getID());
+ }
return cats;
}
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java 2005-03-16 13:13:19 UTC (rev 385)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/AtoZConfig.java 2005-03-16 13:59:03 UTC (rev 386)
@@ -23,8 +23,9 @@
import com.arsdigita.london.util.ui.CategoryPicker;
import com.arsdigita.london.util.ui.ApplicationCategoryPicker;
+import com.arsdigita.util.parameter.BooleanParameter;
+import com.arsdigita.util.parameter.ClassParameter;
import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.util.parameter.ClassParameter;
import com.arsdigita.util.parameter.URLParameter;
import com.arsdigita.util.UncheckedWrapperException;
@@ -44,6 +45,7 @@
private Set m_types;
private Parameter m_adapters;
private Parameter m_rootCategoryPicker;
+ private BooleanParameter m_useSubsiteSpecificNavigationCategory;
public AtoZConfig() {
m_types = new HashSet();
@@ -62,9 +64,15 @@
Parameter.REQUIRED,
ApplicationCategoryPicker.class);
+ m_useSubsiteSpecificNavigationCategory = new BooleanParameter
+ ("com.arsdigita.london.atoz.use_subsite_specific_navigation_category",
+ Parameter.OPTIONAL,
+ Boolean.FALSE);
+
register(m_adapters);
register(m_rootCategoryPicker);
-
+ register(m_useSubsiteSpecificNavigationCategory);
+
loadInfo();
}
@@ -89,4 +97,8 @@
return (AtoZProviderType[])m_types
.toArray(new AtoZProviderType[m_types.size()]);
}
+
+ public boolean useSubsiteSpecificNavigationCategory() {
+ return ((Boolean) get(m_useSubsiteSpecificNavigationCategory)).booleanValue();
+ }
}
|
|
From: <fa...@re...> - 2005-03-16 13:15:29
|
Author: fabrice Date: 2005-03-16 14:13:19 +0100 (Wed, 16 Mar 2005) New Revision: 385 Modified: releases/1.0.2/ccm-ldn-aplaws/doc/generic-content/items/term-mapping.xml Log: Mappings were referring to lgsl2.00, now refer to 2.01 to load properly; the mappings may have to be updated more thoroughly at some point Modified: releases/1.0.2/ccm-ldn-aplaws/doc/generic-content/items/term-mapping.xml =================================================================== --- releases/1.0.2/ccm-ldn-aplaws/doc/generic-content/items/term-mapping.xml 2005-03-16 12:53:49 UTC (rev 384) +++ releases/1.0.2/ccm-ldn-aplaws/doc/generic-content/items/term-mapping.xml 2005-03-16 13:13:19 UTC (rev 385) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <terms:itemMapping xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"> - <terms:domain resource="http://www.esd.org.uk/standards/lgsl/2.00/lgsltermslist.xml"/> + <terms:domain resource="http://www.esd.org.uk/standards/lgsl/2.01/lgsltermslist.xml"/> <terms:mapping> <terms:term id="1"/> <terms:item path="/content/generic-content/education/help-for-nursery-primary-and-secondary-school-pupils/education-2-1"/> |
|
From: <ap...@re...> - 2005-03-16 12:55:57
|
Author: apevec
Date: 2005-03-16 13:53:49 +0100 (Wed, 16 Mar 2005)
New Revision: 384
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java
Log:
fix from the 1.0.2 release branch
Modified: ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2005-03-16 12:51:57 UTC (rev 383)
+++ ccm-cms/trunk/src/com/arsdigita/cms/search/ContentPageMetadataProvider.java 2005-03-16 12:53:49 UTC (rev 384)
@@ -19,6 +19,7 @@
package com.arsdigita.cms.search;
import com.arsdigita.cms.ContentPage;
+import com.arsdigita.cms.ContentSection;
import com.arsdigita.domain.DomainObject;
import com.arsdigita.search.ContentProvider;
import com.arsdigita.search.ContentType;
@@ -63,7 +64,12 @@
}
public String getContentSection(DomainObject dobj) {
- ContentPage item = (ContentPage)dobj;
- return item.getContentSection().getName();
+ String sectionName = "";
+ ContentPage item = (ContentPage)dobj;
+ ContentSection section = item.getContentSection();
+ if (section != null) {
+ sectionName = section.getName();
+ }
+ return sectionName;
}
}
|
Author: mbooth
Date: 2005-03-16 13:51:57 +0100 (Wed, 16 Mar 2005)
New Revision: 383
Added:
releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/
Removed:
releases/1.0.2/ccm-ldn-terms/pdl/com/arsdigita/london/terms/atoz/
releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/atoz/
releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/atoz/
Modified:
releases/1.0.2/ccm-ldn-aplaws/application.xml
releases/1.0.2/ccm-ldn-atoz/application.xml
releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl
releases/1.0.2/ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml
releases/1.0.2/ccm-ldn-atoz/src/ccm-ldn-atoz.load
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java
releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java
releases/1.0.2/ccm-ldn-dublin/application.xml
releases/1.0.2/ccm-ldn-navigation/application.xml
releases/1.0.2/ccm-ldn-rss/application.xml
releases/1.0.2/ccm-ldn-terms/application.xml
releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.load
releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java
Log:
Reverse the terms->atoz dependency. From a code point of view this may seem a
little strange, but in practise, terms is more 'library' than atoz. This
dependency has been extremely troublesome.
Bump both atoz and terms to version 1.0.2.
Modified: releases/1.0.2/ccm-ldn-aplaws/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-aplaws/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-aplaws/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -12,7 +12,7 @@
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-subsite" version="1.4.1"/>
<ccm:requires name="ccm-ldn-portal" version="1.4.2"/>
- <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
<ccm:requires name="ccm-cms-types-article" version="6.1.0"/>
</ccm:dependencies>
Modified: releases/1.0.2/ccm-ldn-atoz/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-atoz/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -2,14 +2,15 @@
<ccm:application name="ccm-ldn-atoz"
prettyName="A-Z"
- version="1.0.1"
- release="4"
+ version="1.0.2"
+ release="1"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
</ccm:dependencies>
<ccm:contacts>
Copied: releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms (from rev 377, releases/1.0.2/ccm-ldn-terms/pdl/com/arsdigita/london/terms/atoz)
Modified: releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl
===================================================================
--- releases/1.0.2/ccm-ldn-terms/pdl/com/arsdigita/london/terms/atoz/DomainProvider.pdl 2005-03-15 15:43:28 UTC (rev 377)
+++ releases/1.0.2/ccm-ldn-atoz/pdl/com/arsdigita/london/atoz/terms/DomainProvider.pdl 2005-03-16 12:51:57 UTC (rev 383)
@@ -15,7 +15,7 @@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-model com.arsdigita.london.terms.atoz;
+model com.arsdigita.london.atoz.terms;
import com.arsdigita.london.atoz.AtoZProvider;
import com.arsdigita.london.terms.Domain;
Modified: releases/1.0.2/ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-atoz/src/WEB-INF/resources/atoz-adapters.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -27,12 +27,21 @@
<xrd:property name="/object/rootUseContext/rootCategory/defaultDomainClass"/>
<xrd:property name="/object/rootUseContext/rootCategory/defaultAncestors"/>
</xrd:attributes>
+
<xrd:associations rule="include">
<xrd:property name="/object/rootUseContext"/>
<xrd:property name="/object/rootUseContext/rootCategory"/>
</xrd:associations>
</xrd:adapter>
+ <xrd:adapter objectType="com.arsdigita.london.atoz.terms.DomainProvider">
+ <xrd:attributes rule="exclude">
+ <xrd:property name="/object/id"/>
+ <xrd:property name="/object/defaultDomainClass"/>
+ <xrd:property name="/object/displayName"/>
+ </xrd:attributes>
+ </xrd:adapter>
+
<xrd:adapter objectType="com.arsdigita.london.atoz.AtoZItemProvider">
<xrd:attributes rule="exclude">
<xrd:property name="/object/id"/>
Modified: releases/1.0.2/ccm-ldn-atoz/src/ccm-ldn-atoz.load
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/ccm-ldn-atoz.load 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-atoz/src/ccm-ldn-atoz.load 2005-03-16 12:51:57 UTC (rev 383)
@@ -4,6 +4,7 @@
<table name="acs_objects"/>
<initializer class="com.arsdigita.core.Initializer"/>
<initializer class="com.arsdigita.london.util.Initializer"/>
+ <initializer class="com.arsdigita.london.terms.Initializer"/>
</requires>
<provides>
<table name="atoz_provider"/>
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java
===================================================================
--- releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/Initializer.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -18,19 +18,19 @@
package com.arsdigita.london.atoz;
+import com.arsdigita.london.atoz.terms.DomainProvider;
+import com.arsdigita.london.atoz.ui.admin.CategoryProviderForm;
+import com.arsdigita.london.atoz.ui.admin.CategoryProviderAdmin;
+import com.arsdigita.london.atoz.ui.admin.ItemProviderForm;
+import com.arsdigita.london.atoz.ui.admin.ItemProviderAdmin;
+import com.arsdigita.london.atoz.ui.terms.DomainProviderAdmin;
+import com.arsdigita.london.atoz.ui.terms.DomainProviderForm;
+
import com.arsdigita.db.DbHelper;
-
import com.arsdigita.domain.xml.TraversalHandler;
-
import com.arsdigita.persistence.pdl.ManifestSource;
import com.arsdigita.persistence.pdl.NameFilter;
import com.arsdigita.persistence.pdl.ManifestSource;
-
-import com.arsdigita.london.atoz.ui.admin.CategoryProviderForm;
-import com.arsdigita.london.atoz.ui.admin.CategoryProviderAdmin;
-import com.arsdigita.london.atoz.ui.admin.ItemProviderForm;
-import com.arsdigita.london.atoz.ui.admin.ItemProviderAdmin;
-
import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.runtime.PDLInitializer;
import com.arsdigita.runtime.CompoundInitializer;
@@ -85,5 +85,15 @@
ItemProviderAdmin.class
)
);
+
+ AtoZ.getConfig().registerProviderType(
+ new AtoZProviderType(
+ "ESD Toolkit Domain Provider",
+ "Provides a ESD Toolkit A-Z",
+ DomainProvider.class,
+ DomainProviderForm.class,
+ DomainProviderAdmin.class
+ )
+ );
}
}
Copied: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms (from rev 377, releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/atoz)
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/atoz/DomainGenerator.java 2005-03-15 15:43:28 UTC (rev 377)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainGenerator.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -16,20 +16,19 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.terms.atoz;
+package com.arsdigita.london.atoz.terms;
-
import com.arsdigita.london.atoz.AbstractAtoZGenerator;
-import com.arsdigita.london.atoz.AtoZEntry;
import com.arsdigita.london.atoz.AtoZAtomicEntry;
-import com.arsdigita.categorization.Category;
-import com.arsdigita.london.terms.Term;
+import com.arsdigita.london.atoz.AtoZEntry;
import com.arsdigita.london.terms.Domain;
-import com.arsdigita.domain.DomainCollection;
+import com.arsdigita.london.terms.Term;
+import com.arsdigita.categorization.Category;
+import com.arsdigita.domain.DomainCollection;
import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.Filter;
+import com.arsdigita.persistence.OID;
import java.util.List;
import java.util.ArrayList;
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/atoz/DomainProvider.java 2005-03-15 15:43:28 UTC (rev 377)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/terms/DomainProvider.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -16,26 +16,20 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.terms.atoz;
+package com.arsdigita.london.atoz.terms;
+import com.arsdigita.london.atoz.AtoZGenerator;
+import com.arsdigita.london.atoz.AtoZProvider;
+import com.arsdigita.london.terms.Domain;
+
+import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.DataQuery;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.terms.Domain;
-import com.arsdigita.london.atoz.AtoZProvider;
-import com.arsdigita.london.atoz.AtoZGenerator;
-import com.arsdigita.categorization.Category;
-
public class DomainProvider extends AtoZProvider {
public static final String BASE_DATA_OBJECT_TYPE
- = "com.arsdigita.london.terms.atoz.DomainProvider";
+ = "com.arsdigita.london.atoz.terms.DomainProvider";
public static final String DOMAIN = "domain";
Copied: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms (from rev 377, releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/atoz)
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/atoz/DomainProviderAdmin.java 2005-03-15 15:43:28 UTC (rev 377)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderAdmin.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -16,17 +16,18 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.terms.ui.atoz;
+package com.arsdigita.london.atoz.ui.terms;
-import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.bebop.event.ActionEvent;
-import com.arsdigita.bebop.PageState;
+import com.arsdigita.london.atoz.ui.admin.ProviderAdmin;
+import com.arsdigita.london.atoz.ui.admin.ProviderDetails;
+
import com.arsdigita.bebop.ActionLink;
+import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.Component;
-import com.arsdigita.london.atoz.ui.admin.ProviderDetails;
-import com.arsdigita.london.atoz.ui.admin.ProviderAdmin;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.event.ActionEvent;
+import com.arsdigita.bebop.event.ActionListener;
+import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
public class DomainProviderAdmin extends ProviderAdmin {
Modified: releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/ui/atoz/DomainProviderForm.java 2005-03-15 15:43:28 UTC (rev 377)
+++ releases/1.0.2/ccm-ldn-atoz/src/com/arsdigita/london/atoz/ui/terms/DomainProviderForm.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -16,33 +16,27 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-package com.arsdigita.london.terms.ui.atoz;
+package com.arsdigita.london.atoz.ui.terms;
-import com.arsdigita.london.atoz.AtoZ;
import com.arsdigita.london.atoz.AtoZProvider;
import com.arsdigita.london.atoz.ui.admin.ProviderForm;
-import com.arsdigita.london.terms.atoz.DomainProvider;
-import com.arsdigita.web.Web;
-import com.arsdigita.web.Application;
+import com.arsdigita.london.atoz.terms.DomainProvider;
import com.arsdigita.london.terms.Domain;
+
import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.event.PrintEvent;
import com.arsdigita.bebop.event.PrintListener;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.util.Classes;
-import java.util.Map;
-import java.util.Iterator;
+
import java.util.TooManyListenersException;
-import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-
public class DomainProviderForm extends ProviderForm {
private SingleSelect m_domain;
Modified: releases/1.0.2/ccm-ldn-dublin/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-dublin/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-dublin/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -4,13 +4,13 @@
prettyName="Dublin Core"
version="1.4.1"
release="7"
- webapp="ROOT"
+ webapp="ROOT"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
- <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
<ccm:requires name="ccm-ldn-navigation" version="1.4.4"/>
</ccm:dependencies>
Modified: releases/1.0.2/ccm-ldn-navigation/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-navigation/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-navigation/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -11,7 +11,7 @@
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
- <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
</ccm:dependencies>
<ccm:contacts>
Modified: releases/1.0.2/ccm-ldn-rss/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-rss/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-rss/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -10,7 +10,7 @@
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
- <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.2"/>
</ccm:dependencies>
<ccm:contacts>
Modified: releases/1.0.2/ccm-ldn-terms/application.xml
===================================================================
--- releases/1.0.2/ccm-ldn-terms/application.xml 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-terms/application.xml 2005-03-16 12:51:57 UTC (rev 383)
@@ -2,15 +2,14 @@
<ccm:application name="ccm-ldn-terms"
prettyName="Terms"
- version="1.0.1"
- release="4"
+ version="1.0.2"
+ release="1"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.1"/>
<ccm:requires name="ccm-cms" version="6.1.1"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
- <ccm:requires name="ccm-ldn-atoz" version="1.0.1"/>
</ccm:dependencies>
<ccm:contacts>
Modified: releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.load
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.load 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-terms/src/ccm-ldn-terms.load 2005-03-16 12:51:57 UTC (rev 383)
@@ -2,10 +2,8 @@
<requires>
<table name="inits"/>
<table name="acs_objects"/>
- <table name="atoz_provider"/>
<initializer class="com.arsdigita.core.Initializer"/>
<initializer class="com.arsdigita.london.util.Initializer"/>
- <initializer class="com.arsdigita.london.atoz.Initializer"/>
</requires>
<provides>
<table name="trm_app"/>
Modified: releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java
===================================================================
--- releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java 2005-03-16 12:45:45 UTC (rev 382)
+++ releases/1.0.2/ccm-ldn-terms/src/com/arsdigita/london/terms/Initializer.java 2005-03-16 12:51:57 UTC (rev 383)
@@ -16,7 +16,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-
package com.arsdigita.london.terms;
import com.arsdigita.domain.DomainObject;
@@ -43,19 +42,8 @@
import com.arsdigita.kernel.URLFinder;
import com.arsdigita.kernel.NoValidURLException;
-import com.arsdigita.london.atoz.AtoZProviderType;
-import com.arsdigita.london.atoz.AtoZ;
-import com.arsdigita.london.terms.ui.atoz.DomainProviderAdmin;
-import com.arsdigita.london.terms.ui.atoz.DomainProviderForm;
-import com.arsdigita.london.terms.atoz.DomainProvider;
-
import com.arsdigita.xml.XML;
-import com.arsdigita.util.UncheckedWrapperException;
-
-import java.net.URL;
-
-
public class Initializer extends CompoundInitializer {
public Initializer() {
@@ -135,16 +123,6 @@
}
});
- AtoZ.getConfig().registerProviderType(
- new AtoZProviderType(
- "ESD Toolkit Domain Provider",
- "Provides a ESD Toolkit A-Z",
- DomainProvider.class,
- DomainProviderForm.class,
- DomainProviderAdmin.class
- )
- );
-
XML.parse(Terms.getConfig().getTraversalAdapters(),
new TraversalHandler());
}
|
|
From: <mb...@re...> - 2005-03-16 12:47:49
|
Author: mbooth
Date: 2005-03-16 13:45:45 +0100 (Wed, 16 Mar 2005)
New Revision: 382
Modified:
releases/1.0.2/ccm-forum/src/com/arsdigita/forum/Loader.java
Log:
Merge forum Loader fix (379) from head
Modified: releases/1.0.2/ccm-forum/src/com/arsdigita/forum/Loader.java
===================================================================
--- releases/1.0.2/ccm-forum/src/com/arsdigita/forum/Loader.java 2005-03-16 12:44:00 UTC (rev 381)
+++ releases/1.0.2/ccm-forum/src/com/arsdigita/forum/Loader.java 2005-03-16 12:45:45 UTC (rev 382)
@@ -25,6 +25,7 @@
import com.arsdigita.kernel.User;
import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
+import com.arsdigita.persistence.SessionManager;
import com.arsdigita.runtime.ScriptContext;
@@ -61,6 +62,7 @@
//setupInboxAppType();
setupRecentPostingsPortletType();
setupDigestUser();
+ SessionManager.getSession().flushAll();
}
}.run();
}
|
|
From: <mb...@re...> - 2005-03-16 12:46:14
|
Author: mbooth Date: 2005-03-16 13:44:00 +0100 (Wed, 16 Mar 2005) New Revision: 381 Removed: releases/1.0.2/ccm-core/lib/postgresql.jar Log: Removing troublesome postgresql jar. This should now be provided by the host system and set in the classpath. The ccm-java rpm achieves this. Deleted: releases/1.0.2/ccm-core/lib/postgresql.jar |
|
From: <fa...@re...> - 2005-03-16 12:15:55
|
Author: fabrice Date: 2005-03-16 13:13:30 +0100 (Wed, 16 Mar 2005) New Revision: 380 Added: releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql Log: Upgrade script for terms: switching dependency with atoz Added: releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql =================================================================== --- releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql 2005-03-16 08:03:52 UTC (rev 379) +++ releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/switch-terms-atoz-dep.sql 2005-03-16 12:13:30 UTC (rev 380) @@ -0,0 +1,18 @@ + +// switch the dependency from atoz to terms + +// switch the initializer dependency +update init_requirements +set required_init = 'com.arsdigita.london.terms.Initializer', + init = 'com.arsdigita.london.atoz.Initializer' +where required_init = 'com.arsdigita.london.atoz.Initializer' +and init = 'com.arsdigita.london.terms.Initializer'; + +// switch the DomainProvider from terms.atoz to atoz.terms +update acs_objects +set object_type = 'com.arsdigita.london.atoz.terms.DomainProvider', + default_domain_class = 'com.arsdigita.london.atoz.terms.DomainProvider', + display_name = 'com.arsdigita.london.atoz.terms.DomainProvider ' || object_id +where object_type = 'com.arsdigita.london.terms.atoz.DomainProvider'; + + Added: releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql =================================================================== --- releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql 2005-03-16 08:03:52 UTC (rev 379) +++ releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-1.0.1-1.0.2.sql 2005-03-16 12:13:30 UTC (rev 380) @@ -0,0 +1 @@ +@ ../default/upgrade/switch-terms-atoz-dep.sql Added: releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql =================================================================== --- releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql 2005-03-16 08:03:52 UTC (rev 379) +++ releases/1.0.2/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-1.0.1-1.0.2.sql 2005-03-16 12:13:30 UTC (rev 380) @@ -0,0 +1 @@ +@ ../default/upgrade/switch-terms-atoz-dep.sql |
|
From: <ap...@re...> - 2005-03-16 08:10:25
|
Author: apevec
Date: 2005-03-16 09:03:52 +0100 (Wed, 16 Mar 2005)
New Revision: 379
Modified:
ccm-forum/trunk/src/com/arsdigita/forum/Loader.java
Log:
fix (indirect) Permission exception in ccm-forum Loader (due to User.afterSave)
Modified: ccm-forum/trunk/src/com/arsdigita/forum/Loader.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/Loader.java 2005-03-15 19:26:57 UTC (rev 378)
+++ ccm-forum/trunk/src/com/arsdigita/forum/Loader.java 2005-03-16 08:03:52 UTC (rev 379)
@@ -25,6 +25,7 @@
import com.arsdigita.kernel.User;
import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
+import com.arsdigita.persistence.SessionManager;
import com.arsdigita.runtime.ScriptContext;
@@ -61,6 +62,7 @@
//setupInboxAppType();
setupRecentPostingsPortletType();
setupDigestUser();
+ SessionManager.getSession().flushAll();
}
}.run();
}
|
|
From: <ap...@re...> - 2005-03-15 19:29:06
|
Author: apevec
Date: 2005-03-15 20:26:57 +0100 (Tue, 15 Mar 2005)
New Revision: 378
Modified:
tools/trunk/tools/commands/mkservice
tools/trunk/tools/commands/mkservice.usage
tools/trunk/tools/configure.in
Log:
at Matt's suggestion, don't bother with filtering,
simply symlink to master copies of ccm.webapps and ccm.classpath in /etc/ccm/
Modified: tools/trunk/tools/commands/mkservice
===================================================================
--- tools/trunk/tools/commands/mkservice 2005-03-15 15:43:28 UTC (rev 377)
+++ tools/trunk/tools/commands/mkservice 2005-03-15 19:26:57 UTC (rev 378)
@@ -30,10 +30,10 @@
my $verbose = 0;
my $CCM_HOME = $ARGV[0];
my $service_name = $ARGV[1];
-my @apps;
-for (my $i=2; $i <= $#ARGV; $i++) {
- push @apps, $ARGV[$i];
-}
+#my @apps;
+#for (my $i=2; $i <= $#ARGV; $i++) {
+# push @apps, $ARGV[$i];
+#}
Getopt::Long::Configure("pass_through");
if ( ! GetOptions(
@@ -50,7 +50,7 @@
if ( ! defined($CCM_HOME)
|| ! defined($service_name)
- || ! @apps
+# || ! @apps
) {
CCM::CommandsUtil::printUsageAndExit();
}
@@ -124,9 +124,14 @@
chown $uid, $gid, $templates;
# copy $webapps $classpath to new CCM_HOME, filtering thru @apps
-&filter($webapps, 'ccm.webapps', \@apps);
-&filter($classpath, 'ccm.classpath', \@apps);
+#&filter($classpath, 'ccm.classpath', \@apps);
+#&filter($webapps, 'ccm.webapps', \@apps);
+# at Matt's suggestion, don't bother with filtering,
+# simply symlink to masters in /etc/ccm/
+symlink $classpath, 'ccm.classpath';
+symlink $webapps, 'ccm.webapps';
+
# copy $ccminit to $service, with modifications
open DST,">$service"
or CCM::Util::error("$service create failed");
Modified: tools/trunk/tools/commands/mkservice.usage
===================================================================
--- tools/trunk/tools/commands/mkservice.usage 2005-03-15 15:43:28 UTC (rev 377)
+++ tools/trunk/tools/commands/mkservice.usage 2005-03-15 19:26:57 UTC (rev 378)
@@ -1,4 +1,4 @@
-usage: mkservice [OPTIONS] instance_root_directory service_name PACKAGE-KEYS
+usage: mkservice [OPTIONS] instance_root_directory service_name
Options:
--help Display help
Modified: tools/trunk/tools/configure.in
===================================================================
--- tools/trunk/tools/configure.in 2005-03-15 15:43:28 UTC (rev 377)
+++ tools/trunk/tools/configure.in 2005-03-15 19:26:57 UTC (rev 378)
@@ -4,7 +4,7 @@
AC_INIT(ccm-tools.spec.in)
VERSION=2.1.2
-RELEASE=1
+RELEASE=2
AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
AC_SUBST(RELEASE)
|
|
From: <mb...@re...> - 2005-03-15 15:45:37
|
Author: mbooth Date: 2005-03-15 16:43:28 +0100 (Tue, 15 Mar 2005) New Revision: 377 Added: releases/1.0.2/tools/ Log: Branch tools for APLAWS+ 1.0.2 release Copied: releases/1.0.2/tools (from rev 376, tools/trunk) |
18 messages has been excluded from this view by a project administrator.
