cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r124480 - in cocoon/branches/BRANCH_2_1_X: . src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input src/blocks/portal/samples/skins/basic src/blocks/portal/samples/skins/basic/images src/blocks/portal/samples/skins/common src/blocks/portal/samples/skins/common/images
Date Fri, 07 Jan 2005 11:42:25 GMT
Author: cziegeler
Date: Fri Jan  7 03:42:22 2005
New Revision: 124480

URL: http://svn.apache.org/viewcvs?view=rev&rev=124480
Log:
Fix paths
Added:
   cocoon/branches/BRANCH_2_1_X/org.apache.ojb.log
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/images/thumb.jpg
      - copied unchanged from r124479, cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/thumb.jpg  
(contents, props changed)
Removed:
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/thumb.jpg
Modified:
   cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java

Added: cocoon/branches/BRANCH_2_1_X/org.apache.ojb.log
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/org.apache.ojb.log?view=auto&rev=124480
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/org.apache.ojb.log	Fri Jan  7 03:42:22 2005
@@ -0,0 +1,35 @@
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'display-name' as child of 'servlet'.
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+0     WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+10    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+10    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+10    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+10    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'display-name' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+20    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'display-name' as child of 'servlet'.
+30    WARN  [main] webxml.WebXmlParser - Ignored element 'init-param' as child of 'servlet'.
+9964  ERROR [main] store.DiskStore - IOException reading index. Creating new index. 
+43292 WARN  [main] server.XindiceServlet - The database 'db' root directory has been set
to D:\dev\workspace\cocoon-2.1.x\build\webapp\WEB-INF\db. Keep in mind that if a war upgrade
will take place the database will be lost.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java?view=diff&rev=124480&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java&r1=124479&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java&r2=124480
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
Fri Jan  7 03:42:22 2005
@@ -58,14 +58,6 @@
 	 */
 	public Object getAttribute(String name, Configuration modeConf, Map objectModel) 
     throws ConfigurationException {
-        if ( "skin".equals(name) ) {
-            return "common";
-        } else if ( "skin.basepath".equals(name) ) {
-            return "context://samples/blocks/portal/skins/common";
-        } else if ( "skin.thumbnailpath".equals(name) ) {
-            return "thumbnail.jpg";
-        }
-
         // lazy init
         if ( this.moduleSelector == null ) {
             synchronized ( this ) {

Copied: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/images/thumb.jpg
(from r124479, cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg)
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/images/thumb.jpg?view=diff&rev=124480&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg&r1=124479&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/images/thumb.jpg&r2=124480
==============================================================================

Deleted: /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/thumb.jpg?view=auto&rev=124479
==============================================================================

Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/thumb.jpg
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/thumb.jpg?view=auto&rev=124480
==============================================================================
Binary file. No diff available.

Deleted: /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/thumb.jpg
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/thumb.jpg?view=auto&rev=124479
==============================================================================

Mime
View raw message