cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r279819 - in /cocoon: blocks/deli/trunk/WEB-INF/deli/config/ blocks/deli/trunk/WEB-INF/xconf/ blocks/deli/trunk/java/org/apache/cocoon/components/deli/ trunk/ trunk/lib/ trunk/lib/optional/
Date Fri, 09 Sep 2005 17:05:06 GMT
Author: jheymans
Date: Fri Sep  9 10:04:54 2005
New Revision: 279819

URL: http://svn.apache.org/viewcvs?rev=279819&view=rev
Log:
<action dev="JHS" type="fix" fixes-bug="35537" due-to="Mark H. Butler" due-to-email="mark-h.butler@hp.com">
      Deli block updated to use the latest revision of DELI. This uses a more robust method
of loading configuration 
      files that should ensure DELI works on different apps servers or deployed as a WAR.
</action>

Added:
    cocoon/trunk/lib/optional/deli-x050330.jar   (with props)
Removed:
    cocoon/trunk/lib/optional/deli-x031104.jar
Modified:
    cocoon/blocks/deli/trunk/WEB-INF/deli/config/deliConfig.xml
    cocoon/blocks/deli/trunk/WEB-INF/deli/config/namespaceConfig.xml
    cocoon/blocks/deli/trunk/WEB-INF/xconf/cocoon-deli.xconf
    cocoon/blocks/deli/trunk/java/org/apache/cocoon/components/deli/DeliImpl.java
    cocoon/trunk/gump.xml
    cocoon/trunk/lib/jars.xml
    cocoon/trunk/status.xml

Modified: cocoon/blocks/deli/trunk/WEB-INF/deli/config/deliConfig.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/WEB-INF/deli/config/deliConfig.xml?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/WEB-INF/deli/config/deliConfig.xml (original)
+++ cocoon/blocks/deli/trunk/WEB-INF/deli/config/deliConfig.xml Fri Sep  9 10:04:54 2005
@@ -16,9 +16,9 @@
 -->
 <deli>
 	
- <localProfilesFile>WEB-INF/deli/config/profiles.rdf</localProfilesFile>
+ <localProfilesFile>deli/config/profiles.rdf</localProfilesFile>
 
- <localProfilesPath>WEB-INF/deli/legacyProfiles</localProfilesPath>
+ <localProfilesPath>deli/legacyProfiles</localProfilesPath>
 
  <useLocalProfilesIfNoCCPP>true</useLocalProfilesIfNoCCPP>
 
@@ -34,11 +34,11 @@
 
  <useCapabilityClasses>false</useCapabilityClasses> 
 
- <capabilityClassFile>WEB-INF/deli/config/capClass.xml</capabilityClassFile>

+ <capabilityClassFile>deli/config/capClass.xml</capabilityClassFile> 
 
- <namespaceConfigFile>WEB-INF/deli/config/namespaceConfig.xml</namespaceConfigFile>
+ <namespaceConfigFile>deli/config/namespaceConfig.xml</namespaceConfigFile>
 
- <datatypeConfigFile>WEB-INF/deli/config/uaprofValidatorConfig.xml</datatypeConfigFile>
+ <datatypeConfigFile>deli/config/uaprofValidatorConfig.xml</datatypeConfigFile>
 
  <!-- note that the default uri is also hardcoded -->
  <rdfsUri>http://www.w3.org/1999/PR-rdf-schema-19990303#</rdfsUri>

Modified: cocoon/blocks/deli/trunk/WEB-INF/deli/config/namespaceConfig.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/WEB-INF/deli/config/namespaceConfig.xml?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/WEB-INF/deli/config/namespaceConfig.xml (original)
+++ cocoon/blocks/deli/trunk/WEB-INF/deli/config/namespaceConfig.xml Fri Sep  9 10:04:54 2005
@@ -21,45 +21,45 @@
 
   <namespace>
    <uri>http://www.openmobilealliance.org/tech/profiles/UAPROF/ccppschema-20030226#</uri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20030226.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20030226.rdfs</schemaVocabularyFile>
    <datatypeUri>http://www.openmobilealliance.org/tech/profiles/uaprof/xmlschema-20030226</datatypeUri>
-   <datatypeFile>/WEB-INF/deli/config/vocab/xmlschema-20030226.xsd</datatypeFile>
+   <datatypeFile>deli/config/vocab/xmlschema-20030226.xsd</datatypeFile>
   </namespace>   
 
   <namespace>
    <uri>http://www.openmobilealliance.org/tech/profiles/UAPROF/ccppschema-20021212#</uri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20021212.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20021212.rdfs</schemaVocabularyFile>
   </namespace>
 
   <namespace>
    <uri>http://www.wapforum.org/UAPROF/ccppschema-20020710#</uri>
    <aliasUri>http://www.wapforum.org/profiles/UAPROF/ccppschema-20020710#</aliasUri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20020710.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20020710.rdfs</schemaVocabularyFile>
   </namespace>
 
   <namespace>
    <uri>http://www.wapforum.org/profiles/MMS/ccppschema-20010111#</uri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20010111.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20010111.rdfs</schemaVocabularyFile>
   </namespace>
 
   <namespace>
    <uri>http://www.wapforum.org/UAPROF/ccppschema-20000405#</uri>
    <aliasUri>http://www.wapforum.org/profiles/ccppschema-20000405#</aliasUri>
    <aliasUri>http://www.wapforum.org/profiles/UAPROF/ccppschema-20000405#</aliasUri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20000405.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20000405.rdfs</schemaVocabularyFile>
   </namespace>
   
   <namespace>
    <uri>http://www.wapforum.org/UAPROF/ccppschema-20010330#</uri>
    <aliasUri>http://www.wapforum.org/profiles/UAPROF/ccppschema-20010330#</aliasUri>
  
    <aliasUri>http://www.wapforum.org/UAPROF/ccppschema-19991014#</aliasUri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20010330.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20010330.rdfs</schemaVocabularyFile>
   </namespace>
 
   <namespace>
    <uri>http://www.wapforum.org/UAPROF/ccppschema-20010430#</uri>
    <aliasUri>http://www.wapforum.org/profiles/UAPROF/ccppschema-20010430#</aliasUri>
-   <schemaVocabularyFile>/WEB-INF/deli/config/vocab/ccppschema-20010430.rdfs</schemaVocabularyFile>
+   <schemaVocabularyFile>deli/config/vocab/ccppschema-20010430.rdfs</schemaVocabularyFile>
   </namespace>
    
  </namespaceDeclaration>

Modified: cocoon/blocks/deli/trunk/WEB-INF/xconf/cocoon-deli.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/WEB-INF/xconf/cocoon-deli.xconf?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/WEB-INF/xconf/cocoon-deli.xconf (original)
+++ cocoon/blocks/deli/trunk/WEB-INF/xconf/cocoon-deli.xconf Fri Sep  9 10:04:54 2005
@@ -36,6 +36,6 @@
       | device that runs on.
       +-->
   <deli class="org.apache.cocoon.components.deli.DeliImpl">
-    <parameter name="deli-config-file" value="WEB-INF/deli/config/deliConfig.xml"/>
+    <parameter name="deli-config-file" value="deli/config/deliConfig.xml"/>
   </deli>
 </components>

Modified: cocoon/blocks/deli/trunk/java/org/apache/cocoon/components/deli/DeliImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/java/org/apache/cocoon/components/deli/DeliImpl.java?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/java/org/apache/cocoon/components/deli/DeliImpl.java (original)
+++ cocoon/blocks/deli/trunk/java/org/apache/cocoon/components/deli/DeliImpl.java Fri Sep
 9 10:04:54 2005
@@ -74,7 +74,7 @@
                ThreadSafe, Contextualizable {
 
     /** The name of the main DELI configuration file */
-    private String deliConfig = "WEB-INF/deli/config/deliConfig.xml";
+    private String deliConfig = "deli/config/deliConfig.xml";
 
     /** The service manager */
     protected ServiceManager manager = null;

Modified: cocoon/trunk/gump.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/gump.xml?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/trunk/gump.xml (original)
+++ cocoon/trunk/gump.xml Fri Sep  9 10:04:54 2005
@@ -1524,7 +1524,7 @@
       Delivery context library
     </description>
     <home nested="lib/optional"/>
-    <jar name="deli-x031104.jar"/>
+    <jar name="deli-x050330.jar"/>
   </project>
 
   <project name="jing">

Modified: cocoon/trunk/lib/jars.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/jars.xml?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/trunk/lib/jars.xml (original)
+++ cocoon/trunk/lib/jars.xml Fri Sep  9 10:04:54 2005
@@ -336,7 +336,7 @@
       delivery context.
     </description>
     <used-by>DELI (deli block)</used-by>
-    <lib>optional/deli-x031104.jar</lib>
+    <lib>optional/deli-x050330.jar</lib>
     <homepage>http://delicon.sourceforge.net</homepage>
   </file>
 

Added: cocoon/trunk/lib/optional/deli-x050330.jar
URL: http://svn.apache.org/viewcvs/cocoon/trunk/lib/optional/deli-x050330.jar?rev=279819&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/lib/optional/deli-x050330.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/status.xml?rev=279819&r1=279818&r2=279819&view=diff
==============================================================================
--- cocoon/trunk/status.xml (original)
+++ cocoon/trunk/status.xml Fri Sep  9 10:04:54 2005
@@ -198,6 +198,10 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="JHS" type="fix" fixes-bug="35537" due-to="Mark H. Butler" due-to-email="mark-h.butler@hp.com">
+      Deli block updated to use the latest revision of DELI. This uses a more robust method
of loading configuration 
+      files that should ensure DELI works on different apps servers or deployed as a WAR.
+    </action>
     <action dev="JHS" type="fix" fixes-bug="29712" due-to="Gunnar Brand" due-to-email="g.brand@interface-business.de">
       MultipartParser now removes partially uploaded files
     </action>



Mime
View raw message