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...> - 2004-12-08 22:09:37
|
Author: mbooth
Date: 2004-12-08 23:01:19 +0100 (Wed, 08 Dec 2004)
New Revision: 146
Modified:
ccm-forum/trunk/application.xml
ccm-forum/trunk/src/com/arsdigita/forum/ui/PostForm.java
Log:
Fix another control event redirection bug.
Modified: ccm-forum/trunk/application.xml
===================================================================
--- ccm-forum/trunk/application.xml 2004-12-08 21:20:52 UTC (rev 145)
+++ ccm-forum/trunk/application.xml 2004-12-08 22:01:19 UTC (rev 146)
@@ -3,7 +3,7 @@
<ccm:application name="ccm-forum"
prettyName="Forum"
version="1.4.1"
- release="13"
+ release="14"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/PostForm.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/ui/PostForm.java 2004-12-08 21:20:52 UTC (rev 145)
+++ ccm-forum/trunk/src/com/arsdigita/forum/ui/PostForm.java 2004-12-08 22:01:19 UTC (rev 146)
@@ -182,6 +182,13 @@
post.save();
fireCompletionEvent(state);
+
+ state.clearControlEvent();
+ try {
+ throw new RedirectSignal( state.stateAsURL(), true );
+ } catch( IOException ex ) {
+ throw new UncheckedWrapperException( ex );
+ }
}
}
|
|
From: <mb...@re...> - 2004-12-08 21:29:44
|
Author: mbooth
Date: 2004-12-08 22:20:52 +0100 (Wed, 08 Dec 2004)
New Revision: 145
Modified:
ccm-forum/trunk/application.xml
Log:
Bump version number
Modified: ccm-forum/trunk/application.xml
===================================================================
--- ccm-forum/trunk/application.xml 2004-12-08 21:09:32 UTC (rev 144)
+++ ccm-forum/trunk/application.xml 2004-12-08 21:20:52 UTC (rev 145)
@@ -3,7 +3,7 @@
<ccm:application name="ccm-forum"
prettyName="Forum"
version="1.4.1"
- release="12"
+ release="13"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
<ccm:dependencies>
|
|
From: <mb...@re...> - 2004-12-08 21:18:27
|
Author: mbooth
Date: 2004-12-08 22:09:32 +0100 (Wed, 08 Dec 2004)
New Revision: 144
Modified:
ccm-forum/trunk/src/com/arsdigita/forum/BboardDispatcher.java
Log:
Make xml a bit more xsl friendly
Modified: ccm-forum/trunk/src/com/arsdigita/forum/BboardDispatcher.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/BboardDispatcher.java 2004-12-08 21:09:11 UTC (rev 143)
+++ ccm-forum/trunk/src/com/arsdigita/forum/BboardDispatcher.java 2004-12-08 21:09:32 UTC (rev 144)
@@ -67,7 +67,7 @@
}
static Page buildThreadPage(BigDecimalParameter stateParam) {
- Page threadPage = PageFactory.buildPage(XSL_HOOK, "Threads");
+ Page threadPage = PageFactory.buildPage(XSL_HOOK, "Threads", "forumThreadPage");
threadPage.add(new ThreadComponent());
// Register the thread id parameter as a global state parameter.
threadPage.addGlobalStateParam(stateParam);
@@ -78,7 +78,7 @@
}
static Page buildForumPage(BigDecimalParameter stateParam) {
- Page page = PageFactory.buildPage(XSL_HOOK, "Forum");
+ Page page = PageFactory.buildPage(XSL_HOOK, "Forum", "forumPage");
ForumComponent forumComp = new ForumComponent();
page.add(forumComp);
page.addGlobalStateParam(stateParam);
|
|
From: <mb...@re...> - 2004-12-08 21:18:09
|
Author: mbooth
Date: 2004-12-08 22:09:11 +0100 (Wed, 08 Dec 2004)
New Revision: 143
Modified:
ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java
Log:
Redirect after handling control events
Modified: ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java
===================================================================
--- ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2004-12-05 11:03:19 UTC (rev 142)
+++ ccm-forum/trunk/src/com/arsdigita/forum/ui/ThreadDisplay.java 2004-12-08 21:09:11 UTC (rev 143)
@@ -160,6 +160,13 @@
m_post.setSelectedObject(state, post);
m_threadComponent.makeRejectFormVisible(state);
}
+
+ state.clearControlEvent();
+ try {
+ throw new RedirectSignal( state.stateAsURL(), true );
+ } catch( IOException ex ) {
+ throw new UncheckedWrapperException( ex );
+ }
}
private DomainCollection getMessages(PageState state) {
|
Author: mbooth Date: 2004-12-05 12:03:19 +0100 (Sun, 05 Dec 2004) New Revision: 142 Modified: ccm-cms-assets-fileattachment/trunk/application.xml ccm-cms-assets-relatedlink/trunk/application.xml ccm-cms-types-article/trunk/application.xml ccm-cms-types-filestorageitem/trunk/application.xml ccm-cms-types-formitem/trunk/application.xml ccm-cms-types-formsectionitem/trunk/application.xml ccm-cms-types-newsitem/trunk/application.xml ccm-cms/trunk/application.xml ccm-core/trunk/application.xml ccm-forum/trunk/application.xml ccm-ldn-aplaws/trunk/application.xml ccm-ldn-atoz/trunk/application.xml ccm-ldn-dublin/trunk/application.xml ccm-ldn-image-step/trunk/application.xml ccm-ldn-portal/trunk/application.xml ccm-ldn-rss/trunk/application.xml ccm-ldn-search/trunk/application.xml ccm-ldn-shortcuts/trunk/application.xml ccm-ldn-subsite/trunk/application.xml ccm-ldn-terms/trunk/application.xml ccm-ldn-theme/trunk/application.xml ccm-ldn-util/trunk/application.xml ccm-user-preferences/trunk/application.xml Log: Bump version numbers Modified: ccm-cms/trunk/application.xml =================================================================== --- ccm-cms/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms" prettyName="Red Hat CCM Content Management System" version="6.1.0" - release="11" + release="12" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-assets-fileattachment/trunk/application.xml =================================================================== --- ccm-cms-assets-fileattachment/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-assets-fileattachment/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-assets-fileattachment" prettyName="Red Hat CMS Content Asset File Attachment" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-assets-relatedlink/trunk/application.xml =================================================================== --- ccm-cms-assets-relatedlink/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-assets-relatedlink/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-assets-relatedlink" prettyName="Red Hat CMS Content Asset Related Link" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-types-article/trunk/application.xml =================================================================== --- ccm-cms-types-article/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-types-article/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-types-article" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-types-filestorageitem/trunk/application.xml =================================================================== --- ccm-cms-types-filestorageitem/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-types-filestorageitem/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-types-filestorageitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-types-formitem/trunk/application.xml =================================================================== --- ccm-cms-types-formitem/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-types-formitem/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-types-formitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-types-formsectionitem/trunk/application.xml =================================================================== --- ccm-cms-types-formsectionitem/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-types-formsectionitem/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-types-formsectionitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-cms-types-newsitem/trunk/application.xml =================================================================== --- ccm-cms-types-newsitem/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-cms-types-newsitem/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-cms-types-newsitem" prettyName="Red Hat CCM Content Types" version="6.1.0" - release="7" + release="8" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-core/trunk/application.xml =================================================================== --- ccm-core/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-core/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-core" prettyName="Core" version="6.1.0" - release="15" + release="16" webapp="ROOT" buildHooks="build-hooks.xml" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-forum/trunk/application.xml =================================================================== --- ccm-forum/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-forum/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-forum" prettyName="Forum" version="1.4.1" - release="11" + release="12" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-aplaws/trunk/application.xml =================================================================== --- ccm-ldn-aplaws/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-aplaws/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -13,7 +13,7 @@ <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-navigation" version="1.4.3"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> <ccm:requires name="ccm-cms-types-article" version="6.1.0"/> </ccm:dependencies> Modified: ccm-ldn-atoz/trunk/application.xml =================================================================== --- ccm-ldn-atoz/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-atoz/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-atoz" prettyName="A-Z" version="1.0.1" - release="3" + release="4" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-dublin/trunk/application.xml =================================================================== --- ccm-ldn-dublin/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-dublin/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -11,7 +11,7 @@ <ccm:requires name="ccm-core" version="6.1.0"/> <ccm:requires name="ccm-cms" version="6.1.0"/> <ccm:requires name="ccm-ldn-terms" version="1.0.1"/> - <ccm:requires name="ccm-ldn-navigation" version="1.4.3"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> </ccm:dependencies> <ccm:contacts> Modified: ccm-ldn-image-step/trunk/application.xml =================================================================== --- ccm-ldn-image-step/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-image-step/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,14 +3,14 @@ <ccm:application name="ccm-ldn-image-step" prettyName="Image step" version="2.0.0" - release="7" + release="8" webapp="ROOT" 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-ldn-navigation" version="1.4.3"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> </ccm:dependencies> <ccm:contacts> Modified: ccm-ldn-portal/trunk/application.xml =================================================================== --- ccm-ldn-portal/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-portal/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-portal" prettyName="Portal" version="1.4.2" - release="2" + release="3" webapp="ROOT" xmlns:ccm="http://ccm.redhat.com/ccm-project"> Modified: ccm-ldn-rss/trunk/application.xml =================================================================== --- ccm-ldn-rss/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-rss/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-rss" prettyName="RSS" version="1.4.1" - release="7" + release="8" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-search/trunk/application.xml =================================================================== --- ccm-ldn-search/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-search/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-search" prettyName="Search" version="1.4.1" - release="7" + release="8" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-shortcuts/trunk/application.xml =================================================================== --- ccm-ldn-shortcuts/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-shortcuts/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-shortcuts" prettyName="Shortcuts" version="1.4.1" - release="8" + release="9" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-subsite/trunk/application.xml =================================================================== --- ccm-ldn-subsite/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-subsite/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,14 +3,14 @@ <ccm:application name="ccm-ldn-subsite" prettyName="Subsite" version="1.4.1" - release="7" + release="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-ldn-util" version="1.4.1"/> - <ccm:requires name="ccm-ldn-navigation" version="1.4.3"/> + <ccm:requires name="ccm-ldn-navigation" version="1.4.4"/> </ccm:dependencies> <ccm:contacts> Modified: ccm-ldn-terms/trunk/application.xml =================================================================== --- ccm-ldn-terms/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-terms/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-terms" prettyName="Terms" version="1.0.1" - release="3" + release="4" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-theme/trunk/application.xml =================================================================== --- ccm-ldn-theme/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-theme/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-theme" prettyName="Theme" version="1.0.0" - release="7" + release="8" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-ldn-util/trunk/application.xml =================================================================== --- ccm-ldn-util/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-ldn-util/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-ldn-util" prettyName="Util" version="1.4.1" - release="9" + release="10" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> Modified: ccm-user-preferences/trunk/application.xml =================================================================== --- ccm-user-preferences/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141) +++ ccm-user-preferences/trunk/application.xml 2004-12-05 11:03:19 UTC (rev 142) @@ -3,7 +3,7 @@ <ccm:application name="ccm-user-preferences" prettyName="User Preferences" version="1.0.0" - release="1" + release="2" xmlns:ccm="http://ccm.redhat.com/ccm-project"> <ccm:dependencies> |
Author: mbooth
Date: 2004-12-05 11:42:49 +0100 (Sun, 05 Dec 2004)
New Revision: 141
Added:
ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql
ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql
Modified:
ccm-ldn-navigation/trunk/application.xml
ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl
ccm-ldn-navigation/trunk/src/ccm-ldn-navigation.upgrade
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
Log:
Add properties to ObjectListPortletEditor
Modified: ccm-ldn-navigation/trunk/application.xml
===================================================================
--- ccm-ldn-navigation/trunk/application.xml 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/application.xml 2004-12-05 10:42:49 UTC (rev 141)
@@ -2,8 +2,8 @@
<ccm:application name="ccm-ldn-navigation"
prettyName="Navigation"
- version="1.4.3"
- release="9"
+ version="1.4.4"
+ release="1"
webapp="ROOT"
xmlns:ccm="http://ccm.redhat.com/ccm-project">
Modified: ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl
===================================================================
--- ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl 2004-12-05 10:42:49 UTC (rev 141)
@@ -27,6 +27,7 @@
String[1..1] ordering = portlet_object_list.ordering VARCHAR(200);
String[0..1] xmlAttributes = portlet_object_list.xml_attributes VARCHAR(200);
+ String[0..1] dcProperties = portlet_object_list.dc_properties VARCHAR(200);
Integer[1..1] count = portlet_object_list.count INTEGER;
Added: ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql
===================================================================
--- ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/oracle-se-1.4.3-1.4.4.sql 2004-12-05 10:42:49 UTC (rev 141)
@@ -0,0 +1 @@
+alter table portlet_object_list add dc_properties VARCHAR(200);
Added: ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql
===================================================================
--- ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/sql/ccm-ldn-navigation/upgrade/postgres-1.4.3-1.4.4.sql 2004-12-05 10:42:49 UTC (rev 141)
@@ -0,0 +1 @@
+alter table portlet_object_list add dc_properties VARCHAR(200);
Modified: ccm-ldn-navigation/trunk/src/ccm-ldn-navigation.upgrade
===================================================================
--- ccm-ldn-navigation/trunk/src/ccm-ldn-navigation.upgrade 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/src/ccm-ldn-navigation.upgrade 2004-12-05 10:42:49 UTC (rev 141)
@@ -6,4 +6,7 @@
<version from="1.4.2" to="1.4.3">
<script sql="ccm-ldn-navigation/upgrade/::database::-1.4.2-1.4.3.sql"/>
</version>
+ <version from="1.4.3" to="1.4.4">
+ <script sql="ccm-ldn-navigation/upgrade/::database::-1.4.3-1.4.4.sql"/>
+ </version>
</upgrade>
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java 2004-12-05 10:42:49 UTC (rev 141)
@@ -26,15 +26,27 @@
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
+
+import com.arsdigita.london.navigation.AbstractNavigationModel;
import com.arsdigita.london.navigation.DataCollectionDefinition;
+import com.arsdigita.london.navigation.DataCollectionProperty;
+import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
import com.arsdigita.london.navigation.NavigationModel;
-import com.arsdigita.london.navigation.AbstractNavigationModel;
import com.arsdigita.london.navigation.ui.portlet.ObjectListPortletRenderer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
+import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
+
public class ObjectListPortlet extends Portlet {
+ private static final Logger s_log =
+ Logger.getLogger( ObjectListPortlet.class );
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.london.navigation.portlet.ObjectListPortlet";
@@ -43,6 +55,7 @@
public static final String SPECIFIC_OBJECT_TYPE = "specificObjectType";
public static final String ORDERING = "ordering";
public static final String ATTRIBUTES = "xmlAttributes";
+ public static final String PROPERTIES = "dcProperties";
public static final String COUNT = "count";
public static final String FILTER_CATEGORY = "filterCategory";
@@ -51,10 +64,42 @@
public static final String DESCEND_CATEGORIES = "descendCategories";
public static final String EXCLUDE_INDEX_OBJECTS = "excludeIndexObjects";
+ private static final Map s_properties =
+ Collections.synchronizedMap( new HashMap() );
public ObjectListPortlet(DataObject dobj) {
super(dobj);
}
+
+ public static void addProperty( String key, String title,
+ DataCollectionProperty property,
+ DataCollectionPropertyRenderer renderer ) {
+ s_properties.put( key, new Object[] { title, property, renderer } );
+ }
+
+ public static Iterator getRegisteredProperties() {
+ return s_properties.entrySet().iterator();
+ }
+
+ public static DataCollectionProperty getDCProperty( String key ) {
+ Object[] entry = (Object[]) s_properties.get( key );
+ if( null == entry ) {
+ s_log.error( "dcProperty request for non-existent key: " + key );
+ return null;
+ }
+
+ return (DataCollectionProperty) entry[1];
+ }
+
+ public static DataCollectionPropertyRenderer getDCPropertyRenderer( String key ) {
+ Object[] entry = (Object[]) s_properties.get( key );
+ if( null == entry ) {
+ s_log.error( "dcPropertyRenderer request for non-existent key: " + key );
+ return null;
+ }
+
+ return (DataCollectionPropertyRenderer) entry[2];
+ }
public void initialize() {
super.initialize();
@@ -138,6 +183,36 @@
public boolean isExludingIndexObjects() {
return ((Boolean)get(EXCLUDE_INDEX_OBJECTS)).booleanValue();
}
+
+ public void setProperties( Object[] properties ) {
+ StringBuffer buf = new StringBuffer();
+
+ if( null != properties ) {
+ for( int i = 0; i < properties.length; i++ ) {
+ buf.append( properties[i].toString() );
+
+ if( i != properties.length - 1 ) {
+ buf.append( ',' );
+ }
+ }
+ }
+
+ set( PROPERTIES, buf.toString() );
+ }
+
+ public String[] getProperties() {
+ String properties = (String) get( PROPERTIES );
+ if( null == properties ) return new String[] { };
+
+ StringTokenizer tok = new StringTokenizer( properties, "," );
+ String[] result = new String[ tok.countTokens() ];
+
+ for( int i = 0; i < result.length; i++ ) {
+ result[i] = tok.nextToken();
+ }
+
+ return result;
+ }
protected DataCollectionDefinition newDataCollectionDefinition() {
return new DataCollectionDefinition();
@@ -156,6 +231,12 @@
def.setCheckPermissions(isCheckingPermissions());
def.setExcludeIndexObjects(isExludingIndexObjects());
+ String[] properties = getProperties();
+ for( int i = 0; i < properties.length; i++ ) {
+ DataCollectionProperty dcp = getDCProperty( properties[i] );
+ def.addProperty( dcp );
+ }
+
return def;
}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java 2004-12-05 10:42:49 UTC (rev 141)
@@ -18,29 +18,30 @@
package com.arsdigita.london.navigation.ui.portlet;
-import com.arsdigita.bebop.form.Widget;
-import com.arsdigita.bebop.form.SingleSelect;
-import com.arsdigita.bebop.form.RadioGroup;
+import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
+
+import com.arsdigita.bebop.ColumnPanel;
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.Label;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.RequestLocal;
+import com.arsdigita.bebop.event.PrintEvent;
+import com.arsdigita.bebop.event.PrintListener;
+import com.arsdigita.bebop.form.MultipleSelect;
import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.form.OptionGroup;
+import com.arsdigita.bebop.form.RadioGroup;
import com.arsdigita.bebop.form.SingleSelect;
import com.arsdigita.bebop.form.TextField;
-import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.ColumnPanel;
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.parameters.ParameterModel;
-import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.bebop.form.Widget;
+import com.arsdigita.bebop.parameters.ArrayParameter;
import com.arsdigita.bebop.parameters.BooleanParameter;
import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.RequestLocal;
-
+import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.portal.PortletConfigFormSection;
-import com.arsdigita.bebop.event.PrintEvent;
-import com.arsdigita.bebop.event.PrintListener;
-
import com.arsdigita.categorization.Category;
import com.arsdigita.portal.Portlet;
import com.arsdigita.kernel.ACSObject;
@@ -52,15 +53,15 @@
import com.arsdigita.util.StringUtils;
import com.arsdigita.kernel.ResourceType;
-import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
import com.arsdigita.london.util.ui.CategoryPicker;
import com.arsdigita.london.util.ui.ApplicationCategoryPicker;
import com.redhat.persistence.metadata.Root;
import com.redhat.persistence.common.Path;
+import java.util.Iterator;
+import java.util.Map;
import java.util.TooManyListenersException;
-import java.util.Iterator;
public class ObjectListPortletEditor extends PortletConfigFormSection {
@@ -72,6 +73,7 @@
private OptionGroup m_descendCategories;
private OptionGroup m_checkPermissions;
private OptionGroup m_excludeIndexObjects;
+ private OptionGroup m_properties;
private Widget m_count;
private Widget m_order;
@@ -142,6 +144,10 @@
m_attributes = buildAttributesWidget(new StringParameter("attributes"));
add(new Label("Output attributes:", Label.BOLD), ColumnPanel.RIGHT);
add(m_attributes);
+
+ m_properties = new MultipleSelect( "properties" );
+ add( new Label( "Output properties:", Label.BOLD ), ColumnPanel.RIGHT );
+ add( m_properties );
}
protected Widget buildBaseObjectTypeWidget(ParameterModel param) {
@@ -197,6 +203,15 @@
Portlet portlet)
throws FormProcessException {
super.initWidgets(state, portlet);
+
+ Iterator properties = ObjectListPortlet.getRegisteredProperties();
+ while( properties.hasNext() ) {
+ Map.Entry entry = (Map.Entry) properties.next();
+ String key = entry.getKey().toString();
+ String title = ((Object[]) entry.getValue())[0].toString();
+
+ m_properties.addOption( new Option( key, title ), state );
+ }
if (portlet != null) {
ObjectListPortlet myportlet = (ObjectListPortlet)portlet;
@@ -216,6 +231,7 @@
m_checkPermissions.setValue(state, new Boolean(myportlet.isCheckingPermissions()));
m_excludeIndexObjects.setValue(state, new Boolean(myportlet.isExludingIndexObjects()));
+ m_properties.setValue( state, myportlet.getProperties() );
} else {
m_baseObjectType.setValue(state, null);
m_restrictedObjectType.setValue(state, null);
@@ -329,7 +345,6 @@
myportlet.setDescendCategories(((Boolean)m_descendCategories.getValue(state)).booleanValue());
myportlet.setCheckPermissions(((Boolean)m_checkPermissions.getValue(state)).booleanValue());
myportlet.setExcludeIndexObjects(((Boolean)m_excludeIndexObjects.getValue(state)).booleanValue());
+ myportlet.setProperties( (Object[]) m_properties.getValue( state ) );
}
-
-
}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java 2004-12-05 10:40:38 UTC (rev 140)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java 2004-12-05 10:42:49 UTC (rev 141)
@@ -26,6 +26,8 @@
import com.arsdigita.london.navigation.Navigation;
import com.arsdigita.london.navigation.DataCollectionRenderer;
+import com.arsdigita.london.navigation.DataCollectionProperty;
+import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
import com.arsdigita.london.navigation.portlet.ObjectListPortlet;
public class ObjectListPortletRenderer extends AbstractPortletRenderer {
@@ -43,6 +45,13 @@
Element parent) {
DataCollectionRenderer renderer = newDataCollectionRenderer();
renderer.setPageSize(m_portlet.getCount());
+
+ String[] dcProperties = m_portlet.getProperties();
+ for( int i = 0; i < dcProperties.length; i++ ) {
+ DataCollectionPropertyRenderer dcpr =
+ ObjectListPortlet.getDCPropertyRenderer( dcProperties[i] );
+ renderer.addProperty( dcpr );
+ }
String attributes = m_portlet.getAttributes();
if (attributes != null) {
|
|
From: <mb...@re...> - 2004-12-05 10:48:47
|
Author: mbooth
Date: 2004-12-05 11:40:38 +0100 (Sun, 05 Dec 2004)
New Revision: 140
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java
Log:
Fix bizarre, insufficiently explored bug in ContentItemPortlet which prevents the correct title being displayed in the output XML.
Modified: ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java 2004-12-04 15:15:38 UTC (rev 139)
+++ ccm-cms/trunk/src/com/arsdigita/cms/portlet/ContentItemPortlet.java 2004-12-05 10:40:38 UTC (rev 140)
@@ -41,6 +41,13 @@
return BASE_DATA_OBJECT_TYPE;
}
+ public String getTitle() {
+ // I neither know or care why this works, but it does.
+ // Makes bebop:portlet have the correct title attribute
+ // mb...@re... 04/12/2004
+ return "";
+ }
+
public ContentItem getContentItem() {
return (ContentItem) DomainObjectFactory.newInstance
((DataObject) get(ITEM));
|
|
From: <mb...@re...> - 2004-12-04 15:23:53
|
Author: mbooth
Date: 2004-12-04 16:15:38 +0100 (Sat, 04 Dec 2004)
New Revision: 139
Modified:
ccm-core/trunk/src/com/arsdigita/kernel/security/Initializer.java
Log:
Correct the default pagemap urls. Amongst other things, the redirection caused by the missing trailing slash breaks password recovery.
Modified: ccm-core/trunk/src/com/arsdigita/kernel/security/Initializer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/security/Initializer.java 2004-12-04 15:14:42 UTC (rev 138)
+++ ccm-core/trunk/src/com/arsdigita/kernel/security/Initializer.java 2004-12-04 15:15:38 UTC (rev 139)
@@ -239,18 +239,18 @@
private static List s_defaultPageMap = new ArrayList() {
{
put(ROOT_PAGE_KEY, "register/");
- put(EDIT_PAGE_KEY, "register/edit-profile");
+ put(EDIT_PAGE_KEY, "register/edit-profile/");
put(LOGIN_PAGE_KEY, "register/");
- put(NEWUSER_PAGE_KEY, "register/new-user");
- put(LOGOUT_PAGE_KEY, "register/logout");
- put(COOKIES_PAGE_KEY, "register/explain-persistent-cookies");
- put(CHANGE_PAGE_KEY, "register/change-password");
- put(RECOVER_PAGE_KEY, "register/recover-password");
- put(EXPIRED_PAGE_KEY, "register/login-expired");
+ put(NEWUSER_PAGE_KEY, "register/new-user/");
+ put(LOGOUT_PAGE_KEY, "register/logout/");
+ put(COOKIES_PAGE_KEY, "register/explain-persistent-cookies/");
+ put(CHANGE_PAGE_KEY, "register/change-password/");
+ put(RECOVER_PAGE_KEY, "register/recover-password/");
+ put(EXPIRED_PAGE_KEY, "register/login-expired/");
put(WORKSPACE_PAGE_KEY, "pvt/");
put(LOGIN_REDIRECT_PAGE_KEY, "pvt/");
put(PERMISSION_PAGE_KEY, "permissions/");
- put(PERM_SINGLE_PAGE_KEY, "permissions/one");
+ put(PERM_SINGLE_PAGE_KEY, "permissions/one/");
}
private void put(String key, String value) {
add(Arrays.asList(new Object[] { key, value }));
|
|
From: <mb...@re...> - 2004-12-04 15:22:54
|
Author: mbooth
Date: 2004-12-04 16:14:42 +0100 (Sat, 04 Dec 2004)
New Revision: 138
Modified:
ccm-core/trunk/src/com/arsdigita/ui/login/RecoverPasswordPanel.java
ccm-core/trunk/src/com/arsdigita/ui/login/SubsiteDispatcher.java
ccm-core/trunk/src/com/arsdigita/ui/login/UserRegistrationForm.java
Log:
Make the login pages a bit more xsl friendly
Modified: ccm-core/trunk/src/com/arsdigita/ui/login/RecoverPasswordPanel.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/login/RecoverPasswordPanel.java 2004-12-01 19:36:02 UTC (rev 137)
+++ ccm-core/trunk/src/com/arsdigita/ui/login/RecoverPasswordPanel.java 2004-12-04 15:14:42 UTC (rev 138)
@@ -188,6 +188,7 @@
addProcessListener(this);
add(new Label(PASSWORD_QUESTION));
Label question = new Label();
+ question.setIdAttr( "question" );
question.addPrintListener(new PrintListener() {
public void prepare(PrintEvent event) {
Label label = (Label)event.getTarget();
Modified: ccm-core/trunk/src/com/arsdigita/ui/login/SubsiteDispatcher.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/login/SubsiteDispatcher.java 2004-12-01 19:36:02 UTC (rev 137)
+++ ccm-core/trunk/src/com/arsdigita/ui/login/SubsiteDispatcher.java 2004-12-04 15:14:42 UTC (rev 138)
@@ -79,25 +79,28 @@
map.put("index", root);
put(map, Initializer.EDIT_PAGE_KEY, buildSimplePage
- ("login.userEditPage.title", new UserEditForm()));
+ ("login.userEditPage.title", new UserEditForm(), "edit"));
put(map, Initializer.LOGIN_PAGE_KEY, buildSimplePage
("login.userRegistrationForm.title",
- new UserRegistrationForm(Initializer.getAutoRegistrationOn())));
+ new UserRegistrationForm(Initializer.getAutoRegistrationOn()),
+ "login"));
if (Initializer.getAutoRegistrationOn()) {
put(map, Initializer.NEWUSER_PAGE_KEY, buildSimplePage
- ("login.userNewForm.title", new UserNewForm()));
+ ("login.userNewForm.title", new UserNewForm(),"register"));
}
put(map, Initializer.LOGOUT_PAGE_KEY, buildLogOutPage());
put(map, Initializer.COOKIES_PAGE_KEY, buildSimplePage
("login.explainCookiesPage.title", new ElementComponent
- ("subsite:explainPersistentCookies", SUBSITE_NS_URI)));
+ ("subsite:explainPersistentCookies", SUBSITE_NS_URI), "cookies"));
put(map, Initializer.CHANGE_PAGE_KEY, buildSimplePage
- ("login.changePasswordPage.title", new ChangePasswordForm()));
+ ("login.changePasswordPage.title", new ChangePasswordForm(),
+ "changepassword"));
put(map, Initializer.RECOVER_PAGE_KEY, buildSimplePage
- ("login.recoverPasswordPage.title", new RecoverPasswordPanel()));
+ ("login.recoverPasswordPage.title", new RecoverPasswordPanel(),
+ "recoverpassword"));
Page workspace = buildSimplePage
- ("login.workspacePage.title", new UserInfo());
+ ("login.workspacePage.title", new UserInfo(), "workspace");
put(map, Initializer.WORKSPACE_PAGE_KEY, workspace);
put(map, Initializer.EXPIRED_PAGE_KEY, buildExpiredPage());
@@ -148,10 +151,11 @@
*
* @return the new Page
**/
- private static Page buildSimplePage(String title, Component body) {
+ private static Page buildSimplePage(String title, Component body, String id) {
Page page = PageFactory.buildPage(
APPLICATION_NAME,
- new Label(LoginHelper.getMessage(title)));
+ new Label(LoginHelper.getMessage(title)),
+ id);
page.add(body);
page.lock();
return page;
Modified: ccm-core/trunk/src/com/arsdigita/ui/login/UserRegistrationForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/ui/login/UserRegistrationForm.java 2004-12-01 19:36:02 UTC (rev 137)
+++ ccm-core/trunk/src/com/arsdigita/ui/login/UserRegistrationForm.java 2004-12-04 15:14:42 UTC (rev 138)
@@ -200,6 +200,7 @@
public void init(FormSectionEvent event)
throws FormProcessException {
+ s_log.info( "In init" );
try {
// create timestamp
String value = Credential
@@ -215,6 +216,9 @@
public void validate(FormSectionEvent event)
throws FormProcessException {
+
+ s_log.debug( "In validate" );
+
FormData data = event.getFormData();
PageState state = event.getPageState();
try {
@@ -222,6 +226,8 @@
try {
Credential.parse((String)m_timestamp.getValue(state));
} catch (CredentialException e) {
+ s_log.info( "Invalid credential" );
+
final String path = Initializer.getFullURL
(Initializer.EXPIRED_PAGE_KEY, state.getRequest());
@@ -243,6 +249,8 @@
}
public void process(FormSectionEvent event) throws FormProcessException {
+ s_log.debug( "In process" );
+
final PageState state = event.getPageState();
final HttpServletRequest req = state.getRequest();
|
|
From: <ssk...@re...> - 2004-11-24 17:54:18
|
Author: sskracic
Date: 2004-11-24 18:46:31 +0100 (Wed, 24 Nov 2004)
New Revision: 127
Modified:
tools/trunk/scripts/bin/env-conf.sh
Log:
In transition from shell to perl-based make-rpm utility,
compatibility layer of env variables needed to properly build
5x and 6.0 RPMS got lost somehow. Fixed.
Modified: tools/trunk/scripts/bin/env-conf.sh
===================================================================
--- tools/trunk/scripts/bin/env-conf.sh 2004-11-24 16:42:35 UTC (rev 126)
+++ tools/trunk/scripts/bin/env-conf.sh 2004-11-24 17:46:31 UTC (rev 127)
@@ -26,6 +26,22 @@
exit 1
fi
+#######################################################################
+#
+# Compatibility vars for 5.x and 6.0 RPMs
+#
+PKGVERSION="$CCM_PKGVERSION"
+CCMTYPE="$CCM_TYPE"
+PROJECT="$CCM_PROJECT"
+REQUIRES="$CCM_REQUIRES"
+RPM_DEPENDENCIES="$CCM_RPM_DEPENDENCIES"
+NAME="$CCM_APP"
+PACKAGE="$CCM_PACKAGE"
+PRETTYNAME="$CCM_PRETTYNAME"
+VERSION="$CCM_VERSION"
+RELEASE="$CCM_RELEASE"
+export PKGVERSION CCMTYPE PROJECT REQUIRES RPM_DEPENDENCIES NAME PACKAGE PRETTYNAME VERSION RELEASE
+
echo "CCM_PACKAGE: $CCM_PACKAGE"
echo "CCM_VERSION: $CCM_VERSION"
echo "CCM_RELEASE: $CCM_RELEASE"
@@ -53,6 +69,7 @@
echo " CCM_INST_WEBAPP_DIRNAME: $CCM_INST_WEBAPP_DIRNAME"
echo " CCM_PACKAGE_NAME: $CCM_PACKAGE_NAME"
echo " CCM_ROOT_DIR: $CCM_ROOT_DIR"
+echo " CCM_SCRIPTS_COMPAT: $CCM_SCRIPTS_COMPAT"
echo " CCM_SRC_DIR: $CCM_SRC_DIR"
echo " CLASSPATH: $CLASSPATH"
|
|
From: <mb...@re...> - 2004-11-24 16:50:35
|
Author: mbooth
Date: 2004-11-24 17:42:35 +0100 (Wed, 24 Nov 2004)
New Revision: 126
Modified:
ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java
Log:
Add input validation to prevent 2 images being attached to the same item with the same use context.
TODO: Add DM constraint for the same.
Modified: ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java
===================================================================
--- ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java 2004-11-24 16:41:39 UTC (rev 125)
+++ ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java 2004-11-24 16:42:35 UTC (rev 126)
@@ -38,13 +38,22 @@
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.bebop.event.ParameterEvent;
+import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.event.RequestEvent;
import com.arsdigita.bebop.event.RequestListener;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.BigDecimalParameter;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
+import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.bebop.table.TableCellRenderer;
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.util.Assert;
+import com.arsdigita.util.StringUtils;
+
import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ImageAsset;
import com.arsdigita.cms.ItemSelectionModel;
@@ -53,9 +62,6 @@
import com.arsdigita.cms.ui.ImageBrowser;
import com.arsdigita.cms.ui.ImageChooser;
import com.arsdigita.cms.util.GlobalizationUtil;
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.persistence.DataCollection;
import java.io.File;
import java.io.IOException;
@@ -231,6 +237,7 @@
add(new Label("Use Context"));
m_useContext = new TextField("useContext");
m_useContext.setSize(40);
+ m_useContext.addValidationListener( new UniqueUseContextListener() );
add(m_useContext);
m_saveCancel = new SaveCancelSection();
@@ -347,6 +354,7 @@
m_form.add(new Label("Use Context"));
m_useContext = new TextField("useContext");
m_useContext.setSize(40);
+ m_useContext.addValidationListener( new UniqueUseContextListener() );
m_form.add(m_useContext);
m_saveCancel = new SaveCancelSection();
@@ -391,4 +399,46 @@
return m_saveCancel;
}
}
+
+ private class UniqueUseContextListener implements ParameterListener {
+ public void validate( ParameterEvent ev )
+ throws FormProcessException
+ {
+ PageState ps = ev.getPageState();
+ ParameterData data = ev.getParameterData();
+
+ ContentItem item = m_imageStep.getItem( ps );
+ Assert.exists( item, ContentItem.class );
+
+ String value = data.getValue().toString();
+ value = StringUtils.trimleft( value );
+ if( StringUtils.emptyString( value ) ) {
+ value = null;
+ }
+ data.setValue( value );
+
+ DataCollection attachments =
+ ItemImageAttachment.getImageAttachments( item );
+ attachments.addEqualsFilter( ItemImageAttachment.USE_CONTEXT,
+ value );
+
+ try {
+ if( attachments.next() ) {
+ ItemImageAttachment attachment =
+ m_imageStep.getAttachment( ps );
+ BigDecimal dupAttachmentID = (BigDecimal)
+ attachments.get( ItemImageAttachment.ID );
+
+ if( null == attachment ||
+ !attachment.getID().equals( dupAttachmentID ) )
+ {
+ data.addError( "There is already an image for this " +
+ "item with this context" );
+ }
+ }
+ } finally {
+ attachments.close();
+ }
+ }
+ }
}
|
|
From: <mb...@re...> - 2004-11-24 16:49:46
|
Author: mbooth
Date: 2004-11-24 17:41:39 +0100 (Wed, 24 Nov 2004)
New Revision: 125
Added:
ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/
ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/ImagePropertyRenderer.java
ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/SingleImageProperty.java
Modified:
ccm-ldn-image-step/trunk/application.xml
Log:
Add SingleImageProperty to efficiently (no additional queries) pull out a an image with a specific use context in a navigation widget.
Modified: ccm-ldn-image-step/trunk/application.xml
===================================================================
--- ccm-ldn-image-step/trunk/application.xml 2004-11-24 16:40:33 UTC (rev 124)
+++ ccm-ldn-image-step/trunk/application.xml 2004-11-24 16:41:39 UTC (rev 125)
@@ -10,6 +10,7 @@
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.1.0"/>
<ccm:requires name="ccm-cms" version="6.1.0"/>
+ <ccm:requires name="ccm-ldn-navigation" version="1.4.3"/>
</ccm:dependencies>
<ccm:contacts>
Added: ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/ImagePropertyRenderer.java
===================================================================
--- ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/ImagePropertyRenderer.java 2004-11-24 16:40:33 UTC (rev 124)
+++ ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/ImagePropertyRenderer.java 2004-11-24 16:41:39 UTC (rev 125)
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This 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
+ */
+
+package com.arsdigita.cms.contenttypes.imagestep;
+
+import com.arsdigita.london.navigation.DataCollectionPropertyRenderer;
+
+import com.arsdigita.cms.ReusableImageAsset;
+import com.arsdigita.cms.contenttypes.ItemImageAttachment;
+
+import com.arsdigita.persistence.DataAssociation;
+import com.arsdigita.persistence.DataAssociationCursor;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.util.UncheckedWrapperException;
+import com.arsdigita.xml.Element;
+
+/**
+ * Classes implementing this interface will render in XML a property which
+ * will normally have been previously added to a
+ * <code>DataCollectionDefinition</code>.
+ */
+public class ImagePropertyRenderer implements DataCollectionPropertyRenderer {
+ public static final String XML_NS =
+ "http://ccm.redhat.com/london/image_attachments";
+
+ /**
+ * Called from DataCollectionRenderer for every returned item. This method
+ * will add XML for the property to the renderer's output.
+ */
+ public void render( DataCollection dc, Element parent ) {
+
+ Object images = dc.get( ItemImageAttachment.IMAGE_ATTACHMENTS );
+ if( null == images ) return;
+
+ if( images instanceof DataObject ) {
+ Element root = rootElement( parent );
+ render( (DataObject) images, root );
+ }
+
+ else if( images instanceof DataAssociation ) {
+ // XXX: Unused, untested code path
+ DataAssociationCursor cursor = ((DataAssociation) images).cursor();
+
+ Element root = null;
+ while( cursor.next() ) {
+ if( null == root ) root = rootElement( parent );
+ render( cursor.getDataObject(), root );
+ }
+ }
+
+ else {
+ throw new UncheckedWrapperException(
+ "While trying to render image property, " +
+ ItemImageAttachment.IMAGE_ATTACHMENTS +
+ " association returned a " + images.getClass().getName() +
+ " (" + images.toString() +
+ "). Expected either a DataObject or a DataAssociation."
+ );
+ }
+ }
+
+ private void render( DataObject obj, Element root ) {
+ Element ia = root.newChildElement( "ia:imageAttachment", XML_NS );
+
+ DataObject image = (DataObject) obj.get( ItemImageAttachment.IMAGE );
+
+ Object context = obj.get( ItemImageAttachment.USE_CONTEXT );
+ Object caption = obj.get( ItemImageAttachment.CAPTION );
+ Object imageID = image.get( ReusableImageAsset.ID );
+ Object width = image.get( ReusableImageAsset.WIDTH );
+ Object height = image.get( ReusableImageAsset.HEIGHT );
+
+ Element imageIDE = ia.newChildElement( "ia:imageID", XML_NS );
+ imageIDE.setText( imageID.toString() );
+
+ if( null != context ) {
+ Element contextE = ia.newChildElement( "ia:context", XML_NS );
+ contextE.setText( context.toString() );
+ }
+
+ if( null != caption ) {
+ Element captionE = ia.newChildElement( "ia:caption", XML_NS );
+ captionE.setText( caption.toString() );
+ }
+
+ if( null != width ) {
+ Element widthE = ia.newChildElement( "ia:width", XML_NS );
+ widthE.setText( width.toString() );
+ }
+
+ if( null != height ) {
+ Element heightE = ia.newChildElement( "ia:height", XML_NS );
+ heightE.setText( height.toString() );
+ }
+ }
+
+ private Element rootElement( Element parent ) {
+ return parent.newChildElement( "ia:imageAttachments", XML_NS );
+ }
+}
Added: ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/SingleImageProperty.java
===================================================================
--- ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/SingleImageProperty.java 2004-11-24 16:40:33 UTC (rev 124)
+++ ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/imagestep/SingleImageProperty.java 2004-11-24 16:41:39 UTC (rev 125)
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This 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
+ */
+
+package com.arsdigita.cms.contenttypes.imagestep;
+
+import com.arsdigita.london.navigation.DataCollectionProperty;
+
+import com.arsdigita.persistence.CompoundFilter;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.Filter;
+import com.arsdigita.persistence.FilterFactory;
+
+import com.arsdigita.cms.ReusableImageAsset;
+import com.arsdigita.cms.contenttypes.ItemImageAttachment;
+
+/**
+ * Add a single image with a specific context.
+ */
+public class SingleImageProperty implements DataCollectionProperty {
+ private String m_context;
+
+ private static final String IMAGE_ID =
+ ItemImageAttachment.IMAGE_ATTACHMENTS + "." +
+ ItemImageAttachment.IMAGE + "." +
+ ReusableImageAsset.ID;
+
+ private static final String WIDTH =
+ ItemImageAttachment.IMAGE_ATTACHMENTS + "." +
+ ItemImageAttachment.IMAGE + "." +
+ ReusableImageAsset.WIDTH;
+
+ private static final String HEIGHT =
+ ItemImageAttachment.IMAGE_ATTACHMENTS + "." +
+ ItemImageAttachment.IMAGE + "." +
+ ReusableImageAsset.HEIGHT;
+
+ private static final String CAPTION =
+ ItemImageAttachment.IMAGE_ATTACHMENTS + "." +
+ ItemImageAttachment.CAPTION;
+
+ private static final String CONTEXT =
+ ItemImageAttachment.IMAGE_ATTACHMENTS + "." +
+ ItemImageAttachment.USE_CONTEXT;
+
+ /**
+ * Create a SingleImageProperty which will pull out a single
+ * ItemImageAttachment with the given use context.
+ */
+ public SingleImageProperty( String context ) {
+ m_context = context;
+ }
+
+ public void addProperty( DataCollection dc ) {
+ dc.addPath( IMAGE_ID );
+ dc.addPath( WIDTH );
+ dc.addPath( HEIGHT );
+ dc.addPath( CAPTION );
+ dc.addPath( CONTEXT );
+
+ FilterFactory ff = dc.getFilterFactory();
+ CompoundFilter or = ff.or();
+
+ or.addFilter( ff.equals( CONTEXT, m_context ) );
+ or.addFilter( ff.equals( IMAGE_ID, null ) );
+
+ dc.addFilter( or );
+ }
+}
|
|
From: <mb...@re...> - 2004-11-24 16:48:17
|
Author: mbooth
Date: 2004-11-24 17:40:33 +0100 (Wed, 24 Nov 2004)
New Revision: 124
Added:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionProperty.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java
Modified:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
Log:
Add DataCollectionProperty and family.
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java 2004-11-24 16:39:49 UTC (rev 123)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java 2004-11-24 16:40:33 UTC (rev 124)
@@ -59,6 +59,7 @@
private ArrayList m_ordering = new ArrayList();
private ArrayList m_excludedTypes = new ArrayList();
+ private ArrayList m_properties = new ArrayList();
public final void setObjectType(String objectType) {
Assert.unlocked(this);
@@ -115,6 +116,11 @@
Assert.unlocked(this);
m_ordering.add(order);
}
+
+ public final void addProperty( DataCollectionProperty property ) {
+ Assert.unlocked( this );
+ m_properties.add( property );
+ }
public final DataCollection getDataCollection(NavigationModel model) {
Assert.locked(this);
@@ -124,6 +130,13 @@
applyFilters(objects, model);
+ Iterator properties = m_properties.iterator();
+ while( properties.hasNext() ) {
+ DataCollectionProperty property = (DataCollectionProperty)
+ properties.next();
+ property.addProperty( objects );
+ }
+
if (m_ordering.size() > 0) {
Iterator orders = m_ordering.iterator();
while (orders.hasNext()) {
Added: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionProperty.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionProperty.java 2004-11-24 16:39:49 UTC (rev 123)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionProperty.java 2004-11-24 16:40:33 UTC (rev 124)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This 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
+ */
+
+package com.arsdigita.london.navigation;
+
+import com.arsdigita.persistence.DataCollection;
+
+/**
+ * Classes implementing this interface will add a property to a
+ * <code>DataCollectionDefinition</code>. An example of this might be a
+ * particular image from <code>imageAttachments</code>.
+ */
+public interface DataCollectionProperty {
+ /**
+ * Called from DataCollectionDefinition. This method will perform any
+ * necessary steps to add the property to the DataCollection in advance of
+ * it being fetched.
+ */
+ public void addProperty( DataCollection dc );
+}
Added: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java 2004-11-24 16:39:49 UTC (rev 123)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionPropertyRenderer.java 2004-11-24 16:40:33 UTC (rev 124)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This 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
+ */
+
+package com.arsdigita.london.navigation;
+
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.xml.Element;
+
+/**
+ * Classes implementing this interface will render in XML a property which
+ * will normally have been previously added to a
+ * <code>DataCollectionDefinition</code>.
+ */
+public interface DataCollectionPropertyRenderer {
+ /**
+ * Called from DataCollectionRenderer for every returned item. This method
+ * will add XML for the property to the renderer's output.
+ *
+ * @param dc A datacollection whose cursor is currently on the item whose
+ * property is to be renderered.
+ * @param parent The parent XML Element.
+ */
+ public void render( DataCollection dc, Element parent );
+}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2004-11-24 16:39:49 UTC (rev 123)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java 2004-11-24 16:40:33 UTC (rev 124)
@@ -42,6 +42,8 @@
Logger.getLogger(DataCollectionRenderer.class);
private ArrayList m_attributes = new ArrayList();
+ private ArrayList m_properties = new ArrayList();
+
private int m_pageSize = 20;
private boolean m_specializeObjects = false;
private boolean m_wrapAttributes = false;
@@ -56,6 +58,11 @@
m_attributes.add(name);
}
+ public void addProperty(DataCollectionPropertyRenderer pr) {
+ Assert.unlocked(this);
+ m_properties.add(pr);
+ }
+
public void setPageSize(int pageSize) {
Assert.unlocked(this);
m_pageSize = pageSize;
@@ -126,6 +133,12 @@
String[] paths = StringUtils.split(name, '.');
outputValue( item, dobj, name, paths, 0 );
}
+
+ Iterator properties = m_properties.iterator();
+ while( properties.hasNext() ) {
+ DataCollectionPropertyRenderer property = (DataCollectionPropertyRenderer) properties.next();
+ property.render( objects, item );
+ }
OID oid = new OID((String)dobj.get(ACSObject.OBJECT_TYPE),
dobj.get(ACSObject.ID));
|
|
From: <mb...@re...> - 2004-11-24 16:47:37
|
Author: mbooth
Date: 2004-11-24 17:39:49 +0100 (Wed, 24 Nov 2004)
New Revision: 123
Modified:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateTool.java
Log:
Fix bug in argument demarshalling
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateTool.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateTool.java 2004-11-23 13:28:38 UTC (rev 122)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateTool.java 2004-11-24 16:39:49 UTC (rev 123)
@@ -46,8 +46,8 @@
protected void doRun(CommandLine cmdLine) {
final String[] args = cmdLine.getArgs();
final boolean delete = cmdLine.hasOption("d");
- if ((delete && args.length != 1) ||
- (!delete && args.length != 2)) {
+
+ if( args.length == 0 || args.length > 2 ) {
help(System.err);
System.exit(1);
}
|
|
From: <ssk...@re...> - 2004-11-23 13:36:26
|
Author: sskracic
Date: 2004-11-23 14:28:38 +0100 (Tue, 23 Nov 2004)
New Revision: 122
Modified:
users/sskracic/bin/pgcompare.tcl
Log:
Removed dependencies on Tcl 8.4.
Modified: users/sskracic/bin/pgcompare.tcl
===================================================================
--- users/sskracic/bin/pgcompare.tcl 2004-11-22 18:50:26 UTC (rev 121)
+++ users/sskracic/bin/pgcompare.tcl 2004-11-23 13:28:38 UTC (rev 122)
@@ -102,7 +102,11 @@
if {[has_option d] || [has_option s]} {
lappend options 1 2
# remove 12
- set options [lsearch -all -inline -not $options 12]
+ set pos [lsearch $options 12]
+ if {$pos > -1} {
+ set options [lreplace $options $pos $pos]
+ }
+
}
if {[lsearch $options {[12]}] == -1} {
@@ -136,7 +140,7 @@
puts "Obtaining schema for $dbname"
set dbschema [eval exec pg_dump -s $pgdump_opts($dbindex) $dbname]
- foreach type [array names types -glob $filter] {
+ foreach type [array names types $filter] {
puts " Fetching definition for object type: $type"
set rgxp $types($type)
set matches [regexp -inline -all -- $rgxp $dbschema]
|
|
From: <mb...@re...> - 2004-11-22 18:58:15
|
Author: mbooth
Date: 2004-11-22 19:50:26 +0100 (Mon, 22 Nov 2004)
New Revision: 121
Removed:
ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java
Modified:
ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java
ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java
Log:
Remove lazy persistence entirely.
Redirect user to non-action URL after changing a preference.
Modified: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java
===================================================================
--- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-22 18:49:30 UTC (rev 120)
+++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-22 18:50:26 UTC (rev 121)
@@ -82,7 +82,7 @@
// Matt <mb...@re...>
-public class UserPrefs implements HttpSessionActivationListener {
+public class UserPrefs {
private static final Logger s_log = Logger.getLogger( UserPrefs.class );
private static final String COOKIE = "WAF_USER_PREFS";
@@ -209,49 +209,24 @@
}
/**
- * Set a preference. This will not cause the preference to be immediately
- * persisted.
+ * Set a preference.
*
- * <p><strong>NB: Lazy persistence is not currently working, so this will
- * persist immediately for the time being.</strong></p>
- *
* @param key The identifier of the preference to be stored
* @param value The value of the preference to be stored
*/
public void set( String key, String value ) {
m_prefs.put( key, value );
-
- // XXX: remove the line below when lazy persistence works
getPersistent().setValue( key, value );
}
/**
- * Set a preference. Optionally save the preference immediately.
+ * Remove a user preference.
*
- * <p><strong>NB: Lazy persistence is not currently working, so this will
- * persist immediately for the time being.</strong></p>
- *
- * @param key The identifier of the preference to be stored
- * @param value The value of the preference to be stored
- * @param persist true if the value is to be immediately saved
- */
- public void set( String key, String value, boolean persist ) {
- set( key, value );
-
- //if( persist ) {
- getPersistent().setValue( key, value );
- //}
- }
-
- /**
- * Remove a user preference. This change will not be saved immediately.
- *
* @param key The identifier of the preference to be removed
*/
public void remove( String key ) {
m_prefs.remove( key );
- // XXX: remove the line below when lazy persistence works
if( !m_prefs.isEmpty() ) {
getPersistent().removeValue( key );
} else {
@@ -260,27 +235,6 @@
}
/**
- * Remove a user preference. Optionally save this change immediately.
- *
- * <p><strong>NB: Lazy persistence is not currently working, so this will
- * persist immediately for the time being.</strong></p>
- *
- * @param key The identifier of the preference to be removed
- * @param persist true if the change is to be immediately saved
- */
- public void remove( String key, boolean persist ) {
- remove( key );
-
- //if( persist ) {
- if( !m_prefs.isEmpty() ) {
- getPersistent().removeValue( key );
- } else {
- getPersistent().delete();
- }
- //}
- }
-
- /**
* Save user preferences to the database
*/
public void persist() {
@@ -293,16 +247,6 @@
s_log.debug( "Session persisted" );
}
- public void sessionDidActivate(HttpSessionEvent event) {
- // Not interested in this event
- s_log.debug( "Session activated" );
- }
-
- public void sessionWillPassivate(HttpSessionEvent event) {
- s_log.debug( "Session about to be passivated" );
- persist();
- }
-
/**
* Get a PersistentUserPrefs object. Create one if necessary.
*/
Deleted: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java
===================================================================
--- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java 2004-11-22 18:49:30 UTC (rev 120)
+++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java 2004-11-22 18:50:26 UTC (rev 121)
@@ -1,46 +0,0 @@
-/*
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public License
-as published by the Free Software Foundation; either version 2.1 of
-the License, or (at your option) any later version.
-
-This 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
-*/
-
-package com.arsdigita.london.userprefs;
-
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
-import org.apache.log4j.Logger;
-
-public class UserPrefsSessionListener implements HttpSessionListener {
- private static final Logger s_log =
- Logger.getLogger( UserPrefsSessionListener.class );
-
- public void sessionCreated( HttpSessionEvent se ) {
- s_log.debug( "Session created" );
- }
-
- public void sessionDestroyed( HttpSessionEvent se ) {
- s_log.debug( "Session destroyed" );
-
- HttpSession session = se.getSession();
-
- try {
- UserPrefs prefs = (UserPrefs) session.getAttribute
- ( UserPrefs.SESSION_ATTRIBUTE );
- prefs.persist();
- } catch( Throwable t ) {
- s_log.error( t );
- }
- }
-}
Modified: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java
===================================================================
--- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java 2004-11-22 18:49:30 UTC (rev 120)
+++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java 2004-11-22 18:50:26 UTC (rev 121)
@@ -25,8 +25,11 @@
import com.arsdigita.bebop.event.RequestListener;
import com.arsdigita.bebop.parameters.BooleanParameter;
import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.util.UncheckedWrapperException;
+import com.arsdigita.web.RedirectSignal;
import com.arsdigita.xml.Element;
+import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
@@ -84,24 +87,31 @@
String setKey = (String) ps.getValue( m_setKey );
String setValue = (String) ps.getValue( m_setValue );
String remove = (String) ps.getValue( m_remove );
- Boolean immediate = (Boolean) ps.getValue( m_immediate );
UserPrefs prefs = UserPrefs.retrieve( ps.getRequest(),
ps.getResponse() );
+ boolean acted = false;
+
if( null != setKey ) {
- if( Boolean.TRUE.equals( immediate ) ) {
- prefs.set( setKey, setValue, true );
- } else {
- prefs.set( setKey, setValue );
- }
+ prefs.set( setKey, setValue );
+ acted = true;
}
if( null != remove ) {
- if( Boolean.TRUE.equals( immediate ) ) {
- prefs.remove( remove, true );
- } else {
- prefs.remove( remove );
+ prefs.remove( remove );
+ acted = true;
+ }
+
+ if( acted ) {
+ ps.setValue( m_setKey, null );
+ ps.setValue( m_setValue, null );
+ ps.setValue( m_remove, null );
+
+ try {
+ throw new RedirectSignal( ps.stateAsURL(), true );
+ } catch( IOException ex ) {
+ throw new UncheckedWrapperException( ex );
}
}
}
|
|
From: <mb...@re...> - 2004-11-22 18:57:22
|
Author: mbooth
Date: 2004-11-22 19:49:30 +0100 (Mon, 22 Nov 2004)
New Revision: 120
Modified:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java
Log:
Various fixes in navigation when displaying widgets for a different navigation application instance.
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java 2004-11-22 18:48:25 UTC (rev 119)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java 2004-11-22 18:49:30 UTC (rev 120)
@@ -34,11 +34,17 @@
Logger.getLogger( DomainNavigationModel.class );
private String m_domainKey;
+ private NavigationModel m_model = null;
public DomainNavigationModel( String domainKey ) {
m_domainKey = domainKey;
}
+ public DomainNavigationModel( String domainKey, NavigationModel model ) {
+ m_domainKey = domainKey;
+ m_model = model;
+ }
+
private Category getDomainRoot() {
Domain domain = Domain.retrieve( m_domainKey );
Category root = domain.getModel();
@@ -52,15 +58,30 @@
}
protected ACSObject loadObject() {
- return null;
+ return ( null == m_model ) ? null : m_model.getObject();
}
protected Category loadCategory() {
- return getDomainRoot();
+ return ( null == m_model ) ? null : m_model.getCategory();
}
protected Category[] loadCategoryPath() {
- return new Category[]{ getDomainRoot() };
+ Category[] path = null;
+ if( null != m_model ) {
+ Category[] modelPath = m_model.getCategoryPath();
+
+ Category root = getRootCategory();
+
+ for( int i = 0; i < path.length; i++ ) {
+ if( modelPath[i].equals( root ) ) {
+ path = modelPath;
+ break;
+ }
+ }
+ }
+
+ if( null == path ) return new Category[]{ getRootCategory() };
+ return path;
}
protected Category loadRootCategory() {
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java 2004-11-22 18:48:25 UTC (rev 119)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java 2004-11-22 18:49:30 UTC (rev 120)
@@ -216,7 +216,7 @@
ancestors.addOrder(Category.DEFAULT_ANCESTORS);
List ids = new ArrayList();
- StringBuffer path = new StringBuffer("");
+ StringBuffer path = new StringBuffer();
boolean first = true;
while (ancestors.next()) {
Category anc = ancestors.getCategory();
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java 2004-11-22 18:48:25 UTC (rev 119)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java 2004-11-22 18:49:30 UTC (rev 120)
@@ -85,6 +85,18 @@
cat = (Category) DomainObjectFactory.newInstance( obj );
} else {
s_log.debug("we don't have any categories");
+ categories.close();
+
+ assoc = (DataAssociation)DomainServiceInterfaceExposer
+ .get(bundle, "categories");
+ categories = assoc.cursor();
+ categories.addOrder("link.isDefault desc");
+ if( categories.next() ) {
+ s_log.debug( "Got category from another tree" );
+ DataObject obj = categories.getDataObject();
+ categories.close();
+ cat = (Category) DomainObjectFactory.newInstance( obj );
+ }
}
}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java 2004-11-22 18:48:25 UTC (rev 119)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java 2004-11-22 18:49:30 UTC (rev 120)
@@ -18,8 +18,6 @@
package com.arsdigita.london.navigation.ui.category;
-import com.arsdigita.london.navigation.ui.CategoryComponent;
-
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
import com.arsdigita.xml.Element;
@@ -27,7 +25,10 @@
import com.arsdigita.london.navigation.Navigation;
import com.arsdigita.london.navigation.NavigationConstants;
import com.arsdigita.london.navigation.NavigationModel;
+import com.arsdigita.london.navigation.ui.CategoryComponent;
+import java.math.BigDecimal;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -55,7 +56,7 @@
if( s_log.isDebugEnabled() ) {
String catStr = (null == cat) ? "null" : cat.getOID().toString();
- s_log.debug( "Got category: " + catStr );
+ s_log.debug( getClass().getName() + " got category: " + catStr );
}
@@ -83,4 +84,21 @@
return content;
}
+
+ protected Element generateCategoryXML(HttpServletRequest request,
+ HttpServletResponse response,
+ BigDecimal id,
+ String title,
+ String description,
+ String url) {
+ Element e = super.generateCategoryXML( request, response, id, title,
+ description, url );
+
+ Category cat = getModel().getCategory();
+ if( null != cat && cat.getID().equals( id ) ) {
+ e.addAttribute( "isSelected", "true" );
+ }
+
+ return e;
+ }
}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java 2004-11-22 18:48:25 UTC (rev 119)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java 2004-11-22 18:49:30 UTC (rev 120)
@@ -53,23 +53,7 @@
return cat.getDefaultParentCategory();
}
-
- protected Element generateCategoryXML(HttpServletRequest request,
- HttpServletResponse response,
- BigDecimal id,
- String title,
- String description,
- String url) {
- Element element = super.generateCategoryXML(request, response,
- id, title, description, url);
- Category cat = getModel().getCategory();
- if (cat.getID().equals(id)) {
- element.addAttribute("isSelected", "true");
- }
- return element;
- }
-
protected String locateCategory(Category cat) {
if (!(Web.getContext().getApplication() instanceof Navigation)) {
return super.locateCategory(cat);
|
|
From: <mb...@re...> - 2004-11-22 18:57:08
|
Author: mbooth Date: 2004-11-22 19:48:25 +0100 (Mon, 22 Nov 2004) New Revision: 119 Added: ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java Log: Bring in ApplicationAdminAuthListener from former 1.4 branch Added: ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java =================================================================== --- ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java 2004-11-22 17:10:35 UTC (rev 118) +++ ccm-ldn-util/trunk/src/com/arsdigita/london/util/ApplicationAdminAuthListener.java 2004-11-22 18:48:25 UTC (rev 119) @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. + * + * The contents of this file are subject to the CCM Public + * License (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of + * the License at http://www.redhat.com/licenses/ccmpl.html + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + */ + +package com.arsdigita.london.util; + +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.event.RequestEvent; +import com.arsdigita.bebop.event.RequestListener; + +import com.arsdigita.dispatcher.AccessDeniedException; +import com.arsdigita.dispatcher.DispatcherHelper; + + +import com.arsdigita.web.Application; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.Party; +import com.arsdigita.kernel.permissions.PermissionDescriptor; +import com.arsdigita.kernel.permissions.PermissionService; +import com.arsdigita.kernel.permissions.PrivilegeDescriptor; + + +import com.arsdigita.ui.login.UserAuthenticationListener; + +import java.io.IOException; +import org.apache.log4j.Logger; + +/** + * A RequestListener that can check to see if a user + * has or doesn't have a given privilege on the current + * ApplicationInstance. + * + * The user is redirected to ACCESS_DENIED if their is + * insufficient permission. + * + * @param privilegeName a String that represents the privlege name for the + * privilege a user must have to see the page. + * + */ +public class ApplicationAdminAuthListener + extends UserAuthenticationListener + implements RequestListener { + + private static final Logger s_log = Logger.getLogger + (ApplicationAdminAuthListener.class); + + public ApplicationAdminAuthListener() { + super(); + } + + + /** + * Checks whether the user is logged in. If not, redirects the client + * to the login page. + */ + public void pageRequested(RequestEvent event) { + super.pageRequested(event); + + PageState state = event.getPageState(); + + /* Get the current party */ + Party party = Kernel.getContext().getParty(); + + /* Get the current package */ + Application app = (Application)Kernel.getContext().getResource(); + + PermissionDescriptor permDescriptor = + new PermissionDescriptor(PrivilegeDescriptor.ADMIN, + app, + party); + + if (!PermissionService.checkPermission(permDescriptor)) { + throw new AccessDeniedException("not an administrator for this application"); + } + } +} |
|
From: <ssk...@re...> - 2004-11-22 17:18:19
|
Author: sskracic
Date: 2004-11-22 18:10:35 +0100 (Mon, 22 Nov 2004)
New Revision: 118
Modified:
users/sskracic/bin/pgcompare.tcl
Log:
Added support for passing arguments to pg_dump,
which is internally invoked to collect database
metadata.
Modified: users/sskracic/bin/pgcompare.tcl
===================================================================
--- users/sskracic/bin/pgcompare.tcl 2004-11-19 18:53:29 UTC (rev 117)
+++ users/sskracic/bin/pgcompare.tcl 2004-11-22 17:10:35 UTC (rev 118)
@@ -22,6 +22,14 @@
-s shows identical objects only (implies -1 -2, ignores -12)
-d shows different objects only (implies -1 -2, ignores -12)
-h -? shows this help text
+ -p \"opts\" option to be passed to pg_dump which is internally called
+ by this utility. Options must be enclosed in quotes if
+ they contain more than one word, for example
+ -p \"-h pgserver.example.com -U dummy\". IMPORTANT:
+ -p option may be specified *twice*. If that's the case,
+ the first occurrence will be used to connect to db1,
+ and the second for db2. Useful when databases reside on
+ different hosts, or should be accessed by different users.
-- end of options
Multiple options can be specified, although this doesn't
@@ -32,6 +40,9 @@
set err [list]
set filter "*"
+set pgdump_opts(db1) ""
+set pgdump_opts(db2) ""
+set pcount 0
set options [list]
for {set optionc 0} {$optionc < [llength $argv]} {incr optionc} {
set arg [lindex $argv $optionc]
@@ -39,6 +50,20 @@
switch -exact -- $opt {
"-" { break }
"t" { set filter [lindex $argv [incr optionc]] ; lappend options $opt }
+ "p" {
+ set opts [lindex $argv [incr optionc]]
+ incr pcount
+ if {$pcount > 2} {
+ lappend err "-p option cannot be used more than twice"
+ } elseif {$pcount == 1} {
+ set pgdump_opts(db1) $opts
+ set pgdump_opts(db2) $opts
+ } else {
+ # This is the second occurrence. Apply the options
+ # for second db connection only.
+ set pgdump_opts(db2) $opts
+ }
+ }
"n" -
"1" -
"2" -
@@ -109,7 +134,7 @@
set dbname [set $dbindex]
puts "Obtaining schema for $dbname"
- set dbschema [exec pg_dump -s $dbname]
+ set dbschema [eval exec pg_dump -s $pgdump_opts($dbindex) $dbname]
foreach type [array names types -glob $filter] {
puts " Fetching definition for object type: $type"
|
|
From: <ssk...@re...> - 2004-11-19 19:01:01
|
Author: sskracic
Date: 2004-11-19 19:53:29 +0100 (Fri, 19 Nov 2004)
New Revision: 117
Modified:
tools/trunk/misc/build-all.sh
Log:
Removed the last dependency on ccm-devel environment, notably the
hardcoded /var/ccm-devel/rpm/$USER directory path where ccm apps (but
not tools) are to be built. Now the ~/rpm top dir is used for building
both tools and apps. Consequently, RPMs for ccm apps are written to
~/rpm/RPMS/noarch. Take care.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-19 18:20:31 UTC (rev 116)
+++ tools/trunk/misc/build-all.sh 2004-11-19 18:53:29 UTC (rev 117)
@@ -110,8 +110,6 @@
HOMERPMDIR="$HOMETOPDIR/RPMS/noarch"
HOMESRPMDIR="$HOMETOPDIR/SRPMS"
HOMEBUILDDIR="$HOMETOPDIR/BUILD"
-RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch"
-SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS"
PATH=$VIRTUAL_ROOT/bin:$PATH
@@ -299,7 +297,7 @@
. $VIRTUAL_ROOT/etc/profile.d/ccm-devel.sh
. $VIRTUAL_ROOT/etc/profile.d/ccm-scripts.sh
-export CCM_RPM_DIR=/var/ccm-devel/rpm/$USER
+export CCM_RPM_DIR=$HOMETOPDIR
export CCM_RPMBUILD_FLAGS="$RPM_ARGS"
export CLASSPATH="$CLASSPATH:$CCM_SHARED_LIB_DIST_DIR/servlet.jar"
@@ -351,7 +349,7 @@
(
set -e
set_application_properties $i
- $RPM $RPM_ARGS --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $RPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
+ $RPM $RPM_ARGS --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
) || exit $?
done
@@ -485,9 +483,9 @@
set_application_properties $APP
# Copy binary, documentation & source RPMs
- cp $RPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
- cp $RPMDIR/$APP_NAME-doc-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
- cp $SRPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.src.rpm $BUILD_HOME/dist/bundles/$BUNDLE/SRPMS
+ cp $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
+ cp $HOMERPMDIR/$APP_NAME-doc-$APP_VERSION-$RELEASE.noarch.rpm $BUILD_HOME/dist/bundles/$BUNDLE/RPMS
+ cp $HOMESRPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.src.rpm $BUILD_HOME/dist/bundles/$BUNDLE/SRPMS
# Copy binary ZIP
if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then
|
|
From: <ssk...@re...> - 2004-11-19 18:28:08
|
Author: sskracic Date: 2004-11-19 19:20:31 +0100 (Fri, 19 Nov 2004) New Revision: 116 Modified: tools/trunk/misc/build-all.sh Log: Removing the requirement of having ~/.rpmmacros file which points _topdir to ~/rpm, since topdir macro definition is now passed as a command line argument. Modified: tools/trunk/misc/build-all.sh =================================================================== --- tools/trunk/misc/build-all.sh 2004-11-19 18:03:46 UTC (rev 115) +++ tools/trunk/misc/build-all.sh 2004-11-19 18:20:31 UTC (rev 116) @@ -106,9 +106,10 @@ RPM_DB=$VIRTUAL_ROOT/rpmdb RPM_ARGS="--dbpath $RPM_DB" -HOMERPMDIR="$(eval echo ~$USER)/rpm/RPMS/noarch" -HOMESRPMDIR="$(eval echo ~$USER)/rpm/SRPMS" -HOMEBUILDDIR="$(eval echo ~$USER)/rpm/BUILD" +HOMETOPDIR="$(echo ~/rpm)" +HOMERPMDIR="$HOMETOPDIR/RPMS/noarch" +HOMESRPMDIR="$HOMETOPDIR/SRPMS" +HOMEBUILDDIR="$HOMETOPDIR/BUILD" RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch" SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS" @@ -227,10 +228,12 @@ %files EOF - rpmbuild -ba fake.spec + rpmbuild --define="_topdir $HOMETOPDIR" -ba fake.spec $RPM $RPM_ARGS -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm + export RPM_DIR=$HOMETOPDIR + # Build the build tools for i in httpunit junit junitperf servlet servlet22 do |
|
From: <ssk...@re...> - 2004-11-19 18:11:20
|
Author: sskracic Date: 2004-11-19 19:03:46 +0100 (Fri, 19 Nov 2004) New Revision: 115 Modified: tools/trunk/bundle/rollingbuild.sh Log: Added support for relocatable build area, depending on RPM_DIR (to be consistent with other packaages). Modified: tools/trunk/bundle/rollingbuild.sh =================================================================== --- tools/trunk/bundle/rollingbuild.sh 2004-11-18 19:39:24 UTC (rev 114) +++ tools/trunk/bundle/rollingbuild.sh 2004-11-19 18:03:46 UTC (rev 115) @@ -32,7 +32,12 @@ make dist # Build the rpms -rpmbuild -ta --clean ccm-tools-bundle-*.tar.gz +if [ -n "$RPM_DIR" ] +then + rpmbuild -ta --define "_topdir $RPM_DIR" --clean ccm-tools-bundle-*.tar.gz +else + rpmbuild -ta --clean ccm-tools-bundle-*.tar.gz +fi ./make-zip.sh |
|
From: <ssk...@re...> - 2004-11-18 19:46:57
|
Author: sskracic Date: 2004-11-18 20:39:24 +0100 (Thu, 18 Nov 2004) New Revision: 114 Removed: users/sskracic/gnah Log: test -- ignore Deleted: users/sskracic/gnah =================================================================== --- users/sskracic/gnah 2004-11-18 19:38:57 UTC (rev 113) +++ users/sskracic/gnah 2004-11-18 19:39:24 UTC (rev 114) @@ -1 +0,0 @@ -gnah |
|
From: <ssk...@re...> - 2004-11-18 19:46:36
|
Author: sskracic Date: 2004-11-18 20:38:57 +0100 (Thu, 18 Nov 2004) New Revision: 113 Added: users/sskracic/gnah Log: Test. Added: users/sskracic/gnah =================================================================== --- users/sskracic/gnah 2004-11-18 19:33:20 UTC (rev 112) +++ users/sskracic/gnah 2004-11-18 19:38:57 UTC (rev 113) @@ -0,0 +1 @@ +gnah |
|
From: <ssk...@re...> - 2004-11-18 19:40:49
|
Author: sskracic Date: 2004-11-18 20:33:20 +0100 (Thu, 18 Nov 2004) New Revision: 112 Modified: tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.in Log: It's really really really bad if .svn metadata is included in zip/RPM packages. Modified: tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.in =================================================================== --- tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.in 2004-11-18 19:21:19 UTC (rev 111) +++ tools/trunk/scripts/pkg/dist/MANIFEST.SKIP.in 2004-11-18 19:33:20 UTC (rev 112) @@ -4,6 +4,7 @@ */semantic.cache */afiedt.buf */.xvpics/* +*/.svn/* */build/* build/* rollingbuild/* |
18 messages has been excluded from this view by a project administrator.
