You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/07/19 20:02:13 UTC
svn commit: r219735 - in /cocoon/blocks/template/trunk: java/ java/org/apache/cocoon/environment/ java/org/apache/cocoon/template/ java/org/apache/cocoon/template/environment/ java/org/apache/cocoon/template/instruction/ java/org/apache/cocoon/template...

Author: reinhard
Date: Tue Jul 19 11:02:11 2005
New Revision: 219735

URL: http://svn.apache.org/viewcvs?rev=219735&view=rev
Log:
refactor xml-template block to make it usable in osgi

Added:
    cocoon/blocks/template/trunk/java/Manifest.mf
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
      - copied, changed from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumer.java
      - copied, changed from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumerImpl.java
      - copied, changed from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
Removed:
    cocoon/blocks/template/trunk/java/org/apache/cocoon/environment/
    cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/
Modified:
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/JXTemplateGenerator.java
    cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Attribute.java
    cocoon/blocks/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java

Added: cocoon/blocks/template/trunk/java/Manifest.mf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/Manifest.mf?rev=219735&view=auto
==============================================================================
--- cocoon/blocks/template/trunk/java/Manifest.mf (added)
+++ cocoon/blocks/template/trunk/java/Manifest.mf Tue Jul 19 11:02:11 2005
@@ -0,0 +1,52 @@
+Manifest-Version: 1.0
+Specification-Vendor: The Apache Software Fundation
+Implementation-Vendor: The Apache Software Fundation
+Bundle-Name: cocoon
+Bundle-SymbolicName: org.apache.cocoon:template:1.0.0
+Bundle-Version: 1.0.0
+Bundle-Description: Cocoon bundle
+Bundle-Vendor: The Apache Software Foundation
+Bundle-DocURL: http://cocoon.apache.org
+Bundle-ContactAddress: http://cocoon.apache.org
+Bundle-Category: library
+Bundle-Classpath: .
+Export-Package: 
+ org.apache.cocoon.template, 
+ org.apache.cocoon.template.instruction,
+ org.apache.cocoon.template.script, 
+ org.apache.cocoon.template.xml, 
+ org.apache.cocoon.components.expression,
+ org.apache.cocoon.components.expression.jxpath,
+ org.apache.cocoon.components.expression.jexl,
+ org.apache.cocoon.components.accessor,
+ org.apache.cocoon.environment
+Import-Package: org.osgi.framework,
+ org.apache.avalon.framework.context,
+ org.apache.avalon.framework.logger,
+ org.apache.avalon.framework.service,
+ org.apache.avalon.framework.activity,
+ org.apache.avalon.framework.thread,
+ org.apache.avalon.framework.configuration,
+ org.apache.cocoon,
+ org.apache.cocoon.caching,
+ org.apache.cocoon.environment,
+ org.apache.cocoon.generation,
+ org.apache.cocoon.transformation,
+ org.apache.cocoon.util,
+ org.apache.cocoon.util.log,
+ org.apache.cocoon.xml,
+ org.apache.avalon.excalibur.logger,
+ org.apache.excalibur.source,
+ org.apache.excalibur.source.impl,
+ org.apache.excalibur.xml.sax, 
+ org.apache.excalibur.xmlizer,
+ org.apache.log,
+ org.xml.sax,
+ org.apache.cocoon.template.script,
+ org.apache.commons.lang,
+ org.apache.excalibur.store,
+ org.apache.cocoon.components.source,
+ org.apache.cocoon.components.flow,
+ org.apache.commons.jxpath,
+ org.apache.cocoon.xml.dom
+Bundle-UUID: org.apache.cocoon:template:1.0.0:all
\ No newline at end of file

Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/JXTemplateGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/JXTemplateGenerator.java?rev=219735&r1=219734&r2=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/JXTemplateGenerator.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/JXTemplateGenerator.java Tue Jul 19 11:02:11 2005
@@ -26,10 +26,10 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
 import org.apache.cocoon.components.expression.ExpressionContext;
-import org.apache.cocoon.environment.FlowObjectModelHelper;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.generation.ServiceableGenerator;
 import org.apache.cocoon.template.environment.ExecutionContext;
+import org.apache.cocoon.template.environment.FlowObjectModelHelper;
 import org.apache.cocoon.template.environment.JXCacheKey;
 import org.apache.cocoon.template.environment.JXSourceValidity;
 import org.apache.cocoon.template.expression.JXTExpression;
@@ -37,7 +37,7 @@
 import org.apache.cocoon.template.script.ScriptManager;
 import org.apache.cocoon.template.script.event.Event;
 import org.apache.cocoon.template.script.event.StartDocument;
-import org.apache.cocoon.xml.AttributeAwareXMLConsumerImpl;
+import org.apache.cocoon.template.xml.AttributeAwareXMLConsumerImpl;
 import org.apache.cocoon.xml.RedundantNamespacesFilter;
 import org.apache.cocoon.xml.XMLConsumer;
 import org.apache.excalibur.source.SourceValidity;

Copied: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java (from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java?p2=cocoon/blocks/template/trunk/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java&p1=cocoon/blocks/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java&r1=219640&r2=219735&rev=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java Tue Jul 19 11:02:11 2005
@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.environment;
+package org.apache.cocoon.template.environment;
 
 import java.util.Map;
 
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.components.expression.ExpressionContext;
 import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.environment.TemplateObjectModelHelper;
 
 
 /**

Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Attribute.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Attribute.java?rev=219735&r1=219734&r2=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Attribute.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Attribute.java Tue Jul 19 11:02:11 2005
@@ -10,7 +10,7 @@
 import org.apache.cocoon.template.expression.JXTExpression;
 import org.apache.cocoon.template.script.event.Event;
 import org.apache.cocoon.template.script.event.StartElement;
-import org.apache.cocoon.xml.AttributeAwareXMLConsumer;
+import org.apache.cocoon.template.xml.AttributeAwareXMLConsumer;
 import org.apache.cocoon.xml.XMLConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;

Copied: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumer.java (from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumer.java?p2=cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumer.java&p1=cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java&r1=219640&r2=219735&rev=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumer.java Tue Jul 19 11:02:11 2005
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.xml;
+package org.apache.cocoon.template.xml;
 
+import org.apache.cocoon.xml.XMLConsumer;
 import org.xml.sax.SAXException;
 
 /**

Copied: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumerImpl.java (from r219640, cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java)
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumerImpl.java?p2=cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumerImpl.java&p1=cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java&r1=219640&r2=219735&rev=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/xml/AttributeAwareXMLConsumerImpl.java Tue Jul 19 11:02:11 2005
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.xml;
+package org.apache.cocoon.template.xml;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.cocoon.xml.XMLConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;

Modified: cocoon/blocks/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java?rev=219735&r1=219734&r2=219735&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java (original)
+++ cocoon/blocks/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java Tue Jul 19 11:02:11 2005
@@ -24,6 +24,7 @@
 import org.apache.cocoon.components.expression.ExpressionContext;
 import org.apache.cocoon.components.expression.ExpressionException;
 import org.apache.cocoon.components.expression.ExpressionFactory;
+import org.apache.cocoon.template.environment.FlowObjectModelHelper;
 
 public class FOMTestCase extends SitemapComponentTestCase {
     private Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);