Author: lgawron
Date: Sat Apr 23 13:44:12 2005
New Revision: 164419
URL: http://svn.apache.org/viewcvs?rev=164419&view=rev
Log:
template block goes official
apples samples fixed (used continuation.id instead of $cocoon.continuation.id)
jxtg is now o.a.c.template.jxtg.JXTemplateGenerator
dummy deprecated o.a.c.generation.JXTemplateGenerator introduced to keep
backward compatibility (same for transformer)
dependencies reflected in gump.xml
Added:
cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap
cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
(with props)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
(with props)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/transformation/JXTemplateTransformer.java
(with props)
Removed:
cocoon/blocks/unsupported/template/trunk/conf/template.xmap
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Literal.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Subst.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Substitutions.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/LoopTagStatus.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/MacroContext.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartAttribute.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartCall.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartChoose.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartComment.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartDefine.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEval.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartEvalBody.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartForEach.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatDate.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartFormatNumber.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartIf.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartImport.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOtherwise.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartOut.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameter.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartParameterInstance.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartSet.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartTemplate.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/instruction/StartWhen.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Invoker.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/Parser.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/ScriptManager.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/AttributeEvent.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Characters.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/CopyAttribute.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndCDATA.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDTD.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndDocument.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndElement.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndEntity.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndInstruction.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/EndPrefixMapping.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/Event.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/IgnorableWhitespace.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/ProcessingInstruction.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SkippedEntity.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartCDATA.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDTD.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartDocument.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartElement.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartEntity.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartInstruction.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/StartPrefixMapping.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/SubstituteAttribute.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/script/event/TextEvent.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumer.java
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/xml/AttributeAwareXMLConsumerImpl.java
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/accessor/AccessorTestCase.xtest
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.java
(props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/ExpressionTestCase.xtest
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/jexl/JexlTestCase.java
(props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/components/expression/jxpath/JXPathTestCase.java
(props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.java
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/environment/FOMTestCase.xtest
(contents, props changed)
cocoon/blocks/unsupported/template/trunk/test/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.java
Added: cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap?rev=164419&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap
(added)
+++ cocoon/blocks/unsupported/template/trunk/conf/template-generator.xmap Sat
Apr 23 13:44:12 2005
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--+
+ |
+ | SVN $Id$
+ +-->
+<xmap xpath="/sitemap/components/generators"
+ unless="[EMAIL PROTECTED]'jx']">
+
+ <map:generator name="jx"
+ logger="sitemap.generator.jx"
+ src="org.apache.cocoon.template.jxtg.JXTemplateGenerator"
+ label="content"
+ pool-max="16">
+ </map:generator>
+</xmap>
Added: cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap?rev=164419&view=auto
==============================================================================
--- cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap
(added)
+++ cocoon/blocks/unsupported/template/trunk/conf/template-transformer.xmap Sat
Apr 23 13:44:12 2005
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xmap xpath="/sitemap/components/transformers" unless="[EMAIL PROTECTED]'jx']">
+ <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16"
src="org.apache.cocoon.template.jxtg.JXTemplateTransformer"/>
+</xmap>
\ No newline at end of file
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
Sat Apr 23 13:44:12 2005
@@ -1,22 +1,25 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-public interface Accessor {
- public String ROLE = Accessor.class.getName();
-
- public Object getObject();
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+/**
+ * @version SVN $Id$
+ */
+public interface Accessor {
+ public String ROLE = Accessor.class.getName();
+
+ public Object getObject();
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/Accessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,25 +1,28 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-
-public class ContextAccessor extends ObjectModelAccessor {
-
- public Object getObject() {
- return ObjectModelHelper.getContext(getObjectModel());
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import org.apache.cocoon.environment.ObjectModelHelper;
+
+/**
+ * @version SVN $Id$
+ */
+public class ContextAccessor extends ObjectModelAccessor {
+
+ public Object getObject() {
+ return ObjectModelHelper.getContext(getObjectModel());
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContextAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,25 +1,28 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import org.apache.cocoon.components.flow.FlowHelper;
-
-public class ContinuationAccessor extends ObjectModelAccessor {
-
- public Object getObject() {
- return FlowHelper.getWebContinuation(getObjectModel());
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import org.apache.cocoon.components.flow.FlowHelper;
+
+/**
+ * @version SVN $Id$
+ */
+public class ContinuationAccessor extends ObjectModelAccessor {
+
+ public Object getObject() {
+ return FlowHelper.getWebContinuation(getObjectModel());
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ContinuationAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,38 +1,41 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.environment.TemplateObjectModelHelper;
-
-public class FlowAttributeAccessor extends ObjectModelAccessor {
-
- public Object getObject() {
- Map map = new HashMap();
- Object contextObject = FlowHelper.getContextObject(getObjectModel());
-
- if (contextObject instanceof Map) {
- map.putAll((Map)contextObject);
- } else if (contextObject != null) {
- TemplateObjectModelHelper.fillContext(contextObject, map);
- }
-
- return map;
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.environment.TemplateObjectModelHelper;
+
+/**
+ * @version SVN $Id$
+ */
+public class FlowAttributeAccessor extends ObjectModelAccessor {
+
+ public Object getObject() {
+ Map map = new HashMap();
+ Object contextObject = FlowHelper.getContextObject(getObjectModel());
+
+ if (contextObject instanceof Map) {
+ map.putAll((Map)contextObject);
+ } else if (contextObject != null) {
+ TemplateObjectModelHelper.fillContext(contextObject, map);
+ }
+
+ return map;
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/FlowAttributeAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,130 +1,129 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceSelector;
-import org.apache.avalon.framework.thread.ThreadSafe;
-
-/**
- * An accessor that handles a <code>Map</code> of accessors.
- */
-public class MapAccessor implements Accessor, Configurable, Serviceable,
ThreadSafe {
-
- /** Reference to the accessors */
- private Map accessors = null;
-
- /** The service manager instance */
- private ServiceManager manager;
-
- /**
- * The accessors that should be part of the map are configured
- * through <code><element name="the key that will be used in
- * the map" accessor="the name of the accessor"/></code>.
- */
- public void configure(Configuration config) throws ConfigurationException {
- HashMap accessors = new HashMap();
- Configuration[] children = config.getChildren("element");
- for (int i = 0; i < children.length; i++) {
- String accessor = children[i].getAttribute("accessor");
- // use the accessor name as name if nothing else is given
- String name = children[i].getAttribute("name", accessor);
- accessors.put(name, accessor);
- }
- this.accessors = new AccessorMap(accessors, this.manager);
- }
-
- /**
- * Set the current <code>ServiceManager</code> instance used by this
- * <code>Serviceable</code>.
- */
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
- }
-
- /**
- * Release all resources.
- */
- public void dispose() {
- this.manager = null;
- }
-
- /**
- * Get the map of accessors
- */
- public Object getObject() {
- return this.accessors;
- }
-
- /**
- * Map that finds the accessor at access time.
- */
- public class AccessorMap extends HashMap {
-
- private ServiceManager manager;
-
- public AccessorMap(Map map, ServiceManager manager) {
- super(map);
- this.manager = manager;
- }
-
- public Object get(Object key) {
- String accessorName = (String)super.get(key);
- if (accessorName == null)
- return null;
- ServiceSelector accessorSelector = null;
- Accessor accessor = null;
- try {
- // Thread safe accessors could be looked up once and be cached
- accessorSelector =
- (ServiceSelector)this.manager.lookup(Accessor.ROLE +
"Selector");
- accessor = (Accessor)accessorSelector.select(accessorName);
- return accessor.getObject();
- } catch (ServiceException e) {
- // FIXME: Don't know if this is the appropriate action
- throw new RuntimeException("Trying to access non existing
acessor: " +
- accessorName, e);
- } finally {
- accessorSelector.release(accessor);
- this.manager.release(accessorSelector);
- }
- }
-
- // The MapAccessor is thread safe so the map should be read only
- public void clear() {
- throw new UnsupportedOperationException("AccessorMap is read
only");
- }
- public Object put(Object key, Object value) {
- throw new UnsupportedOperationException("AccessorMap is read
only");
- }
- public void putAll(Map m) {
- throw new UnsupportedOperationException("AccessorMap is read
only");
- }
- public Object remove(Object key) {
- throw new UnsupportedOperationException("AccessorMap is read
only");
- }
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.avalon.framework.configuration.Configurable;
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.service.ServiceException;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.avalon.framework.service.Serviceable;
+import org.apache.avalon.framework.thread.ThreadSafe;
+
+/**
+ * An accessor that handles a <code>Map</code> of accessors.
+ * @version SVN $Id$
+ */
+public class MapAccessor implements Accessor, Configurable, Serviceable,
ThreadSafe {
+
+ /** Reference to the accessors */
+ private Map accessors = null;
+
+ /** The service manager instance */
+ private ServiceManager manager;
+
+ /**
+ * The accessors that should be part of the map are configured
+ * through <code><element name="the key that will be used in
+ * the map" accessor="the name of the accessor"/></code>.
+ */
+ public void configure(Configuration config) throws ConfigurationException {
+ HashMap accessors = new HashMap();
+ Configuration[] children = config.getChildren("element");
+ for (int i = 0; i < children.length; i++) {
+ String accessor = children[i].getAttribute("accessor");
+ // use the accessor name as name if nothing else is given
+ String name = children[i].getAttribute("name", accessor);
+ accessors.put(name, accessor);
+ }
+ this.accessors = new AccessorMap(accessors, this.manager);
+ }
+
+ /**
+ * Set the current <code>ServiceManager</code> instance used by this
+ * <code>Serviceable</code>.
+ */
+ public void service(ServiceManager manager) throws ServiceException {
+ this.manager = manager;
+ }
+
+ /**
+ * Release all resources.
+ */
+ public void dispose() {
+ this.manager = null;
+ }
+
+ /**
+ * Get the map of accessors
+ */
+ public Object getObject() {
+ return this.accessors;
+ }
+
+ /**
+ * Map that finds the accessor at access time.
+ */
+ public class AccessorMap extends HashMap {
+
+ private ServiceManager manager;
+
+ public AccessorMap(Map map, ServiceManager manager) {
+ super(map);
+ this.manager = manager;
+ }
+
+ public Object get(Object key) {
+ String accessorName = (String)super.get(key);
+ if (accessorName == null)
+ return null;
+ ServiceSelector accessorSelector = null;
+ Accessor accessor = null;
+ try {
+ // Thread safe accessors could be looked up once and be cached
+ accessorSelector =
+ (ServiceSelector)this.manager.lookup(Accessor.ROLE +
"Selector");
+ accessor = (Accessor)accessorSelector.select(accessorName);
+ return accessor.getObject();
+ } catch (ServiceException e) {
+ // FIXME: Don't know if this is the appropriate action
+ throw new RuntimeException("Trying to access non existing
acessor: " +
+ accessorName, e);
+ } finally {
+ accessorSelector.release(accessor);
+ this.manager.release(accessorSelector);
+ }
+ }
+
+ // The MapAccessor is thread safe so the map should be read only
+ public void clear() {
+ throw new UnsupportedOperationException("AccessorMap is read
only");
+ }
+ public Object put(Object key, Object value) {
+ throw new UnsupportedOperationException("AccessorMap is read
only");
+ }
+ public void putAll(Map m) {
+ throw new UnsupportedOperationException("AccessorMap is read
only");
+ }
+ public Object remove(Object key) {
+ throw new UnsupportedOperationException("AccessorMap is read
only");
+ }
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/MapAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,41 +1,44 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import java.util.Map;
-
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.cocoon.components.ContextHelper;
-
-public class ObjectModelAccessor implements Accessor, Contextualizable {
-
- private Context context;
-
- public void contextualize(Context context)
- throws ContextException{
- this.context = context;
- }
-
- protected Map getObjectModel() {
- return ContextHelper.getObjectModel(this.context);
- }
-
- public Object getObject() {
- return getObjectModel();
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import java.util.Map;
+
+import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.context.ContextException;
+import org.apache.avalon.framework.context.Contextualizable;
+import org.apache.cocoon.components.ContextHelper;
+
+/**
+ * @version SVN $Id$
+ */
+public class ObjectModelAccessor implements Accessor, Contextualizable {
+
+ private Context context;
+
+ public void contextualize(Context context)
+ throws ContextException{
+ this.context = context;
+ }
+
+ protected Map getObjectModel() {
+ return ContextHelper.getObjectModel(this.context);
+ }
+
+ public Object getObject() {
+ return getObjectModel();
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/ObjectModelAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,25 +1,28 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-
-public class RequestAccessor extends ObjectModelAccessor {
-
- public Object getObject() {
- return ObjectModelHelper.getRequest(getObjectModel());
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import org.apache.cocoon.environment.ObjectModelHelper;
+
+/**
+ * @version SVN $Id$
+ */
+public class RequestAccessor extends ObjectModelAccessor {
+
+ public Object getObject() {
+ return ObjectModelHelper.getRequest(getObjectModel());
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/RequestAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
Sat Apr 23 13:44:12 2005
@@ -1,29 +1,32 @@
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.cocoon.components.accessor;
-
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Session;
-
-public class SessionAccessor extends ObjectModelAccessor {
-
- public Object getObject() {
- Request request = ObjectModelHelper.getRequest(getObjectModel());
- Session session = request.getSession(false);
- return session;
- }
-}
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.components.accessor;
+
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Session;
+
+/**
+ * @version SVN $Id$
+ */
+public class SessionAccessor extends ObjectModelAccessor {
+
+ public Object getObject() {
+ Request request = ObjectModelHelper.getRequest(getObjectModel());
+ Session session = request.getSession(false);
+ return session;
+ }
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/accessor/SessionAccessor.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java
Sat Apr 23 13:44:12 2005
@@ -17,22 +17,30 @@
import java.util.Iterator;
+/**
+ * @version SVN $Id$
+ */
public interface Expression {
- public Object evaluate(ExpressionContext context) throws
ExpressionException;
+ public Object evaluate(ExpressionContext context)
+ throws ExpressionException;
- public Iterator iterate(ExpressionContext context) throws
ExpressionException;
+ public Iterator iterate(ExpressionContext context)
+ throws ExpressionException;
- public void assign(ExpressionContext context, Object value) throws
ExpressionException;
+ public void assign(ExpressionContext context, Object value)
+ throws ExpressionException;
public String getExpression();
public String getLanguage();
- /* This method is added to handle that JXPath have two access
- methods getValue and getNode, where getNode gives direct access
- to the object while getValue might do some conversion of the
- object. I would prefer to get rid of the getNode method, but
- have not yet figured out how to get work in JXTG */
+ /*
+ * This method is added to handle that JXPath have two access methods
+ * getValue and getNode, where getNode gives direct access to the object
+ * while getValue might do some conversion of the object. I would prefer to
+ * get rid of the getNode method, but have not yet figured out how to get
+ * work in JXTG
+ */
public Object getNode(ExpressionContext context) throws
ExpressionException;
public void setProperty(String property, Object value);
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/Expression.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
Sat Apr 23 13:44:12 2005
@@ -15,9 +15,12 @@
*/
package org.apache.cocoon.components.expression;
+/**
+ * @version SVN $Id$
+ */
public interface ExpressionCompiler {
public String ROLE = ExpressionCompiler.class.getName();
public Expression compile(String language, String expression)
- throws ExpressionException;
+ throws ExpressionException;
}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java
Sat Apr 23 13:44:12 2005
@@ -18,6 +18,9 @@
import java.util.HashMap;
import java.util.Map;
+/**
+ * @version SVN $Id$
+ */
public class ExpressionContext extends HashMap {
private ExpressionContext closure;
private Object contextBean = null;
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionContext.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java
Sat Apr 23 13:44:12 2005
@@ -19,6 +19,9 @@
import org.apache.avalon.framework.CascadingThrowable;
+/**
+ * @version SVN $Id$
+ */
public class ExpressionException
extends IOException implements CascadingThrowable
{
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionException.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java
Sat Apr 23 13:44:12 2005
@@ -23,6 +23,9 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
+/**
+ * @version SVN $Id$
+ */
public class ExpressionFactory
extends AbstractLogEnabled
implements Disposable, Serviceable, ThreadSafe {
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/ExpressionFactory.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java
Sat Apr 23 13:44:12 2005
@@ -30,6 +30,7 @@
/**
* Jexl Introspector that supports Rhino JavaScript objects
* as well as Java Objects
+ * @version SVN $Id$
*/
public class JSIntrospector extends UberspectImpl {
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JSIntrospector.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java
Sat Apr 23 13:44:12 2005
@@ -20,6 +20,9 @@
import org.apache.cocoon.components.expression.ExpressionCompiler;
import org.apache.cocoon.components.expression.ExpressionException;
+/**
+ * @version SVN $Id$
+ */
public class JexlCompiler implements ExpressionCompiler, ThreadSafe {
public Expression compile(String language, String expression)
throws ExpressionException{
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlCompiler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
Sat Apr 23 13:44:12 2005
@@ -26,6 +26,9 @@
import org.apache.commons.jexl.util.Introspector;
import org.apache.commons.jexl.util.introspection.Info;
+/**
+ * @version SVN $Id$
+ */
public class JexlExpression implements Expression {
private final String language;
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jexl/JexlExpression.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java
Sat Apr 23 13:44:12 2005
@@ -20,6 +20,9 @@
import org.apache.cocoon.components.expression.ExpressionCompiler;
import org.apache.cocoon.components.expression.ExpressionException;
+/**
+ * @version SVN $Id$
+ */
public class JXPathCompiler implements ExpressionCompiler, ThreadSafe {
public Expression compile(String language, String expression)
throws ExpressionException{
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathCompiler.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
Sat Apr 23 13:44:12 2005
@@ -30,6 +30,9 @@
import org.mozilla.javascript.NativeArray;
import org.w3c.dom.Node;
+/**
+ * @version SVN $Id$
+ */
public class JXPathExpression implements Expression {
private final String language;
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/components/expression/jxpath/JXPathExpression.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/environment/FlowObjectModelHelper.java
Sat Apr 23 13:44:12 2005
@@ -25,7 +25,7 @@
/**
* Creation of an Expression context from the TemplateObjectModelHelper
*
- * @version CVS $Id$
+ * @version SVN $Id$
*/
public class FlowObjectModelHelper {
Added:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java?rev=164419&view=auto
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
(added)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Sat Apr 23 13:44:12 2005
@@ -0,0 +1,24 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.generation;
+
+/**
+ * @deprecated
+ * @version SVN $Id$
+ */
+public class JXTemplateGenerator extends
+ org.apache.cocoon.template.jxtg.JXTemplateGenerator {
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/generation/JXTemplateGenerator.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateGenerator.java
Sat Apr 23 13:44:12 2005
@@ -56,8 +56,7 @@
* @cocoon.sitemap.component.pooling.max 16
*
*
- * @version CVS $Id: JXTemplateGenerator.java 111658 2004-12-12 17:28:46Z
- * danielf $
+ * @version SVN $Id$
*/
public class JXTemplateGenerator extends ServiceableGenerator implements
CacheableProcessingComponent {
@@ -111,8 +110,8 @@
public void performGeneration(Event startEvent, Event endEvent)
throws SAXException {
- XMLConsumer consumer = new AttributeAwareXMLConsumerImpl(
- new RedundantNamespacesFilter(this.xmlConsumer));
+ XMLConsumer consumer = new AttributeAwareXMLConsumerImpl(
+ new RedundantNamespacesFilter(this.xmlConsumer));
((Map) expressionContext.get("cocoon")).put("consumer", consumer);
Invoker.execute(consumer, this.expressionContext, new ExecutionContext(
this.definitions, this.scriptManager), null, startEvent, null);
Added:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java?rev=164419&view=auto
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
(added)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
Sat Apr 23 13:44:12 2005
@@ -0,0 +1,27 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.cocoon.template.jxtg;
+
+/**
+ * @version SVN $Id$
+ */
+public class JXTemplateTransformer extends TransformerAdapter {
+ /**
+ * This class is just a placeholder to provide a class name you
+ * can easily reference from your Sitemap. All of its functionality is
+ * provided by its parent class.
+ */
+}
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/JXTemplateTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/TransformerAdapter.java
Sat Apr 23 13:44:12 2005
@@ -28,11 +28,11 @@
import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.SAXException;
-
/**
- * Adapter that makes this generator usable as a transformer
- * (Note there is a performance penalty for this however:
- * you effectively recompile the template for every instance document)
+ * Adapter that makes this generator usable as a transformer (Note there is a
+ * performance penalty for this however: you effectively recompile the template
+ * for every instance document)
+ * @version SVN $Id$
*/
public class TransformerAdapter extends ServiceableTransformer {
static class TemplateConsumer extends Parser implements XMLConsumer {
@@ -41,13 +41,13 @@
this.gen = new JXTemplateGenerator();
}
- public void setup(SourceResolver resolver, Map objectModel, String
src, Parameters parameters)
- throws ProcessingException, SAXException, IOException {
+ public void setup(SourceResolver resolver, Map objectModel, String src,
+ Parameters parameters) throws ProcessingException,
+ SAXException, IOException {
this.gen.setup(resolver, objectModel, null, parameters);
}
- public void service(ServiceManager manager)
- throws ServiceException {
+ public void service(ServiceManager manager) throws ServiceException {
this.gen.service(manager);
}
@@ -75,14 +75,14 @@
templateConsumer.recycle();
}
- public void setup(SourceResolver resolver, Map objectModel, String src,
Parameters parameters)
- throws ProcessingException, SAXException, IOException {
+ public void setup(SourceResolver resolver, Map objectModel, String src,
+ Parameters parameters) throws ProcessingException, SAXException,
+ IOException {
super.setup(resolver, objectModel, src, parameters);
templateConsumer.setup(resolver, objectModel, src, parameters);
}
- public void service(ServiceManager manager)
- throws ServiceException {
+ public void service(ServiceManager manager) throws ServiceException {
super.service(manager);
templateConsumer.service(manager);
}
@@ -92,4 +92,3 @@
templateConsumer.setConsumer(xmlConsumer);
}
}
-
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ErrorHolder.java
Sat Apr 23 13:44:12 2005
@@ -18,7 +18,9 @@
import java.io.PrintStream;
import java.io.PrintWriter;
-
+/**
+ * @version SVN $Id$
+ */
public class ErrorHolder extends Exception {
private Error err;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ExecutionContext.java
Sat Apr 23 13:44:12 2005
@@ -19,6 +19,9 @@
import org.apache.cocoon.template.jxtg.script.ScriptManager;
+/**
+ * @version SVN $Id$
+ */
public class ExecutionContext {
private Map definitions;
private ScriptManager scriptManager;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXCacheKey.java
Sat Apr 23 13:44:12 2005
@@ -17,6 +17,9 @@
import java.io.Serializable;
+/**
+ * @version SVN $Id$
+ */
public final class JXCacheKey implements Serializable {
private final String templateUri;
private final Serializable templateKey;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/JXSourceValidity.java
Sat Apr 23 13:44:12 2005
@@ -19,6 +19,9 @@
import org.apache.excalibur.source.SourceValidity;
+/**
+ * @version SVN $Id$
+ */
public final class JXSourceValidity implements SourceValidity, Serializable {
private final SourceValidity sourceValidity;
private final SourceValidity templateValidity;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/LocatorFacade.java
Sat Apr 23 13:44:12 2005
@@ -20,6 +20,7 @@
/**
* Facade to the Locator to be set on the consumer prior to sending other
* events, location member changeable
+ * @version SVN $Id$
*/
public class LocatorFacade implements Locator {
private Locator locator;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/environment/ValueHelper.java
Sat Apr 23 13:44:12 2005
@@ -20,6 +20,7 @@
import org.apache.commons.lang.StringUtils;
/**
+ * @version SVN $Id$
*/
public class ValueHelper {
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/JXTExpression.java
Sat Apr 23 13:44:12 2005
@@ -29,6 +29,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
+/**
+ * @version SVN $Id$
+ */
public class JXTExpression extends Subst {
private String raw;
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Literal.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Literal.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Literal.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Literal.java
Sat Apr 23 13:44:12 2005
@@ -23,7 +23,9 @@
much more content in elements than in attributes, so it is better to
avoid copying there.
*/
-
+/**
+ * @version SVN $Id$
+ */
public class Literal extends Subst {
public Literal(String val) {
this.value = val.toCharArray();
Modified:
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Subst.java
URL:
http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Subst.java?rev=164419&r1=164418&r2=164419&view=diff
==============================================================================
---
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Subst.java
(original)
+++
cocoon/blocks/unsupported/template/trunk/java/org/apache/cocoon/template/jxtg/expression/Subst.java
Sat Apr 23 13:44:12 2005
@@ -15,6 +15,9 @@
*/
package org.apache.cocoon.template.jxtg.expression;
+/**
+ * @version SVN $Id$
+ */
public class Subst {
// VOID
}
