From davisagli at codespeak.net  Tue Dec  7 20:23:45 2010
From: davisagli at codespeak.net (davisagli at codespeak.net)
Date: Tue,  7 Dec 2010 20:23:45 +0100 (CET)
Subject: [kupu-checkins] r79876 -
	kupu/branch/plone-plip9938-output-filters/kupu/plone/tests
Message-ID: <20101207192345.B10BD282BAD@codespeak.net>

Author: davisagli
Date: Tue Dec  7 20:23:42 2010
New Revision: 79876

Modified:
   kupu/branch/plone-plip9938-output-filters/kupu/plone/tests/test_outputfilters.py
Log:
fix test; p.outputfilters was updated to always use the description as the caption, not the alt text (matching previous kupu captioning behavior)

Modified: kupu/branch/plone-plip9938-output-filters/kupu/plone/tests/test_outputfilters.py
==============================================================================
--- kupu/branch/plone-plip9938-output-filters/kupu/plone/tests/test_outputfilters.py	(original)
+++ kupu/branch/plone-plip9938-output-filters/kupu/plone/tests/test_outputfilters.py	Tue Dec  7 20:23:42 2010
@@ -20,7 +20,7 @@
             'text/x-html-safe', text, mimetype='text/html', context=self.portal)
         self.assertEqual("""<dl class="image-left captioned">
 <dt><a rel="lightbox" href="/plone/folder/gamma"><img src="http://nohost/plone/folder/gamma/image_thumb" alt="My alt text" title="Image" height="84" width="200" /></a></dt>
- <dd class="image-caption" style="width:200px;">My alt text</dd>
+ <dd class="image-caption" style="width:200px;">My caption</dd>
 </dl>
 
   <p><dl class="image-right captioned">

From mihxil at codespeak.net  Fri Dec 17 22:08:45 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 17 Dec 2010 22:08:45 +0100 (CET)
Subject: [kupu-checkins] r80074 - kupu/trunk/kupu/mmbase/tools
Message-ID: <20101217210845.B39CC5089C@codespeak.net>

Author: mihxil
Date: Fri Dec 17 22:08:42 2010
New Revision: 80074

Modified:
   kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
Log:
support for repositories without using the session

Modified: kupu/trunk/kupu/mmbase/tools/searchrelate.jspx
==============================================================================
--- kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	(original)
+++ kupu/trunk/kupu/mmbase/tools/searchrelate.jspx	Fri Dec 17 22:08:42 2010
@@ -19,15 +19,24 @@
         expires="-1">
       <mm:cloud rank="basic user">
 
-        <mm:import externid="prefix" />
         <mm:import externid="currentTitle" />
 
 
-        <mm:import id="repository" from="session" externid="${prefix}repository"  required="true"/>
-        <mm:import id="current"    from="session" externid="${prefix}current"    required="true"/>
+        <mm:import externid="repositoryjsp" />
+        <mm:present referid="repositoryjsp">
+          <mm:include page="${repositoryjsp}" />
+          <mm:import from="request" externid="repository"  required="true"/>
+          <mm:import from="request" externid="current"     required="true"/>
+        </mm:present>
+        <mm:notpresent referid="repositoryjsp">
+          <mm:import externid="prefix" required="true" />
+          <mm:import id="repository" from="session" externid="${prefix}repository"  required="true"/>
+          <mm:import id="current"    from="session" externid="${prefix}current"    required="true"/>
+          <mm:log level="debug">prefix: ${prefix} </mm:log>
+        </mm:notpresent>
+
 
 
-        <mm:log level="debug">prefix: ${prefix} </mm:log>
         <mm:log level="debug">rep: ${repository.sql} </mm:log>
         <mm:log level="debug">cur: ${current.sql} </mm:log>
 

From mihxil at codespeak.net  Fri Dec 17 22:12:02 2010
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Fri, 17 Dec 2010 22:12:02 +0100 (CET)
Subject: [kupu-checkins] r80075 - kupu/trunk/kupu/mmbase
Message-ID: <20101217211202.97DF85089C@codespeak.net>

Author: mihxil
Date: Fri Dec 17 22:12:01 2010
New Revision: 80075

Modified:
   kupu/trunk/kupu/mmbase/Makefile
Log:
made mvn an variable

Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile	(original)
+++ kupu/trunk/kupu/mmbase/Makefile	Fri Dec 17 22:12:01 2010
@@ -19,6 +19,8 @@
 
 DEPLOY=scp://mmbase.org/home/tomcat/downloads/
 
+MVN=mvn
+
 #type in i18n: msginit -l <locale> -i messages.po
 
 
@@ -83,14 +85,14 @@
 
 
 deploy.jars: $(I18N) mmbase-kupu-i18n.jar
-	mvn install:install-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n       -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N)
-	mvn install:install-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar
-	mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n      -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N) -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
-	mvn deploy:deploy-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
+	$(MVN) install:install-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n       -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N)
+	$(MVN) install:install-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar
+	$(MVN) deploy:deploy-file -DgeneratePom.description='Resource bundle with translations of kupu-generic texts' -DgroupId=org.oscom -DartifactId=kupu-i18n      -Dversion=$(VERSION) -Dpackaging=jar -Dfile=$(I18N) -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
+	$(MVN) deploy:deploy-file -DgeneratePom.description='Resource bundle with translations specific to kupu/mmbase' -DgroupId=org.oscom -DartifactId=mmbase-kupu-i18n -Dversion=$(VERSION) -Dpackaging=jar -Dfile=mmbase-kupu-i18n.jar -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
 
 
 deploy: mmbase-kupu.war
-	mvn deploy:deploy-file -DgeneratePom.description='WAR-overlay containing all necessary files to use kupu with MMBase. The mmbase-richtext component depends on this.' -DgroupId=org.oscom -DartifactId=mmbase-kupu      -Dversion=$(VERSION) -Dpackaging=war -Dfile=mmbase-kupu.war -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
+	$(MVN) deploy:deploy-file -DgeneratePom.description='WAR-overlay containing all necessary files to use kupu with MMBase. The mmbase-richtext component depends on this.' -DgroupId=org.oscom -DartifactId=mmbase-kupu      -Dversion=$(VERSION) -Dpackaging=war -Dfile=mmbase-kupu.war -Durl=$(DEPLOY)$(REPO) -DrepositoryId=$(REPOID) -DuniqueVersion=false
 
 
 clean:

From kupu-checkins at codespeak.net  Tue Dec 28 15:40:21 2010
From: kupu-checkins at codespeak.net (kupu-checkins at codespeak.net)
Date: Tue, 28 Dec 2010 15:40:21 +0100 (CET)
Subject: kupu-checkins@codespeak.net VIAGRA ® Official -38%
Message-ID: <20101228144021.EE2B3282BEA@codespeak.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20101228/8425ea41/attachment.htm