svn commit: r517253 - in /lenya/branches/trunk-rework-pubconf/src: java/org/apache/lenya/cms/cocoon/source/ modules-core/sitemanagement/test/canoo/ modules/blog/config/cocoon-xconf/ modules/blog/java/src/org/apache/lenya/blog/cms/usecases/ modules/blog...

Author: nettings
Date: Mon Mar 12 08:30:01 2007
New Revision: 517253

URL: http://svn.apache.org/viewvc?view=rev&rev=517253
Log:
merged trunk changes

Added:
    
lenya/branches/trunk-rework-pubconf/src/modules/blog/java/src/org/apache/lenya/blog/cms/usecases/Publish.java
      - copied unchanged from r517243, 
lenya/trunk/src/modules/blog/java/src/org/apache/lenya/blog/cms/usecases/Publish.java
Removed:
    
lenya/branches/trunk-rework-pubconf/src/modules/blog/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
    lenya/branches/trunk-rework-pubconf/src/modules/profiling/xslt/test.xhtml
    lenya/branches/trunk-rework-pubconf/src/modules/profiling/xslt/test.xml
    lenya/branches/trunk-rework-pubconf/src/webapp/lenya/content/xopus/
    lenya/branches/trunk-rework-pubconf/src/webapp/lenya/xslt/xopus/
Modified:
    
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
    
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
    
lenya/branches/trunk-rework-pubconf/src/modules-core/sitemanagement/test/canoo/test.xml
    
lenya/branches/trunk-rework-pubconf/src/modules/blog/config/cocoon-xconf/usecases-workflow-publish.xconf
    
lenya/branches/trunk-rework-pubconf/src/modules/development/test/canoo/test.xml
    
lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/resources/javascript/fckloader.js
    
lenya/branches/trunk-rework-pubconf/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf

Modified: 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySource.java
 Mon Mar 12 08:30:01 2007
@@ -287,6 +287,13 @@
     }
 
     /**
+     *
+     */
+    public String getSourceURI() {
+        return getContent().getSourceURI();
+    }
+
+    /**
      * @see org.apache.excalibur.source.Source#getMimeType()
      */
     public String getMimeType() {

Modified: 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/java/org/apache/lenya/cms/cocoon/source/RepositorySourceValidity.java
 Mon Mar 12 08:30:01 2007
@@ -34,12 +34,8 @@
      * @param source The source this validity is for.
      */
     public RepositorySourceValidity(RepositorySource source) {
-        this.sourceUri = source.getNode().getSourceURI();
-        try {
-            this.lastModified = source.getNode().getLastModified();
-        } catch (RepositoryException e) {
-            throw new RuntimeException(e);
-        }
+        this.sourceUri = source.getSourceURI();
+        this.lastModified = source.getLastModified();
     }
 
     public int isValid() {

Modified: 
lenya/branches/trunk-rework-pubconf/src/modules-core/sitemanagement/test/canoo/test.xml
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules-core/sitemanagement/test/canoo/test.xml?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/modules-core/sitemanagement/test/canoo/test.xml
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/modules-core/sitemanagement/test/canoo/test.xml
 Mon Mar 12 08:30:01 2007
@@ -25,7 +25,7 @@
     
   <target name="delete">
 
-    <property name="number" value="10"/>
+    <property name="number" value="1"/>
     
     <webtest name="Delete">
       <config host="localhost" port="8888" protocol="http" basepath="default">

Modified: 
lenya/branches/trunk-rework-pubconf/src/modules/blog/config/cocoon-xconf/usecases-workflow-publish.xconf
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/blog/config/cocoon-xconf/usecases-workflow-publish.xconf?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/modules/blog/config/cocoon-xconf/usecases-workflow-publish.xconf
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/modules/blog/config/cocoon-xconf/usecases-workflow-publish.xconf
 Mon Mar 12 08:30:01 2007
@@ -21,7 +21,7 @@
 <xconf xpath="/cocoon/usecases" 
unless="/cocoon/usecases/component-instance[@name = 'blog/workflow.publish']">
   <component-instance name="blog/workflow.publish"
                       logger="lenya.workflow"
-                      class="org.apache.lenya.cms.workflow.usecases.Publish">
+                      class="org.apache.lenya.blog.cms.usecases.Publish">
     <view template="modules/blog/usecases/workflow/publish.jx"/>
   </component-instance>
 </xconf>

Modified: 
lenya/branches/trunk-rework-pubconf/src/modules/development/test/canoo/test.xml
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/development/test/canoo/test.xml?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/modules/development/test/canoo/test.xml 
(original)
+++ 
lenya/branches/trunk-rework-pubconf/src/modules/development/test/canoo/test.xml 
Mon Mar 12 08:30:01 2007
@@ -22,7 +22,7 @@
   
   <target name="main">
     
-    <property name="number" value="3"/>
+    <property name="number" value="1"/>
     
     <webtest name="Stress test">
       <config host="localhost" port="8888" protocol="http" 
basepath="default/authoring">

Modified: 
lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/resources/javascript/fckloader.js
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/resources/javascript/fckloader.js?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/resources/javascript/fckloader.js
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/modules/fckeditor/resources/javascript/fckloader.js
 Mon Mar 12 08:30:01 2007
@@ -27,7 +27,7 @@
   oFCKeditor.Config[ "BaseHref" ] = host + requesturi ;
   oFCKeditor.Config["CustomConfigurationsPath"] = contextPath + 
"/modules/fckeditor/javascript/fckconfig.js"  ;
   oFCKeditor.ToolbarSet = 'Lenya' ;
-  oFCKeditor.Config[ "ImageBrowserURL" ] = host + requesturi 
+'?lenya.usecase=fckeditor.insertImage' ;
-  oFCKeditor.Config[ "LinkBrowserURL" ] = host + requesturi 
+'?lenya.module=fckeditor&lenya.step=link-show&language=en' ;
+  oFCKeditor.Config[ "ImageBrowserURL" ] = requesturi 
+'?lenya.usecase=fckeditor.insertImage' ;
+  oFCKeditor.Config[ "LinkBrowserURL" ] = requesturi 
+'?lenya.module=fckeditor&lenya.step=link-show&language=en' ;
   oFCKeditor.ReplaceTextarea() ;
-}
\ No newline at end of file
+}

Modified: 
lenya/branches/trunk-rework-pubconf/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
URL: 
http://svn.apache.org/viewvc/lenya/branches/trunk-rework-pubconf/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf?view=diff&rev=517253&r1=517252&r2=517253
==============================================================================
--- 
lenya/branches/trunk-rework-pubconf/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
 (original)
+++ 
lenya/branches/trunk-rework-pubconf/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
 Mon Mar 12 08:30:01 2007
@@ -28,7 +28,7 @@
     <!-- Default time in seconds until the resource-type has expired -->  
     <expires seconds="0" />
 
-    <sample-name>homepage.xml</sample-name>
+    
<sample-name>fallback://lenya/modules/homepage/samples/homepage.xml</sample-name>
     <link-attribute xpath="//*[namespace-uri() = 
'http://www.w3.org/1999/xhtml']/@href"/>
     <link-attribute xpath="//*[namespace-uri() = 
'http://www.w3.org/1999/xhtml']/@data"/>
     <format name="xhtml" uri="cocoon://modules/homepage/xhtml.xml"/>