giacomo 00/09/28 12:14:11
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Cocoon.java
src/org/apache/cocoon/sitemap Tag: xml-cocoon2
AbstractSitemap.java
src/org/apache/cocoon/components/language/markup/sitemap/java
Tag: xml-cocoon2 sitemap.xsl
Added: src/org/apache/cocoon/sitemap Tag: xml-cocoon2 Manager.java
Handler.java
Removed: src/org/apache/cocoon/sitemap Tag: xml-cocoon2
SitemapManager.java SitemapHandler.java
Log:
renaming classes in the sitemap package
Revision Changes Path
No revision
No revision
1.4.2.29 +4 -4 xml-cocoon/src/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.4.2.28
retrieving revision 1.4.2.29
diff -u -r1.4.2.28 -r1.4.2.29
--- Cocoon.java 2000/09/22 20:27:23 1.4.2.28
+++ Cocoon.java 2000/09/28 19:13:59 1.4.2.29
@@ -31,7 +31,7 @@
import org.apache.cocoon.components.parser.Parser;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.serialization.Serializer;
-import org.apache.cocoon.sitemap.SitemapManager;
+import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.util.ClassUtils;
import org.xml.sax.InputSource;
@@ -41,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
* (Apache Software Foundation, Exoffice Technologies)
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.4.2.28 $ $Date: 2000/09/22 20:27:23 $
+ * @version CVS $Revision: 1.4.2.29 $ $Date: 2000/09/28 19:13:59 $
*/
public class Cocoon
implements Component, Configurable, ComponentManager, Modifiable,
Processor, Constants {
@@ -62,7 +62,7 @@
private Configuration configuration;
/** The sitemap manager */
- private SitemapManager sitemapManager;
+ private Manager sitemapManager;
/** The root uri/path */
private URL root;
@@ -174,7 +174,7 @@
if (sconf == null) {
throw new ConfigurationException("No sitemap configuration",
conf);
}
- this.sitemapManager = new SitemapManager();
+ this.sitemapManager = new Manager();
this.sitemapManager.setComponentManager(this);
this.sitemapManager.setConfiguration(conf);
this.sitemapFileName = sconf.getAttribute("file");
No revision
No revision
1.1.2.9 +2 -2
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java
Index: AbstractSitemap.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/sitemap/Attic/AbstractSitemap.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- AbstractSitemap.java 2000/09/16 00:20:21 1.1.2.8
+++ AbstractSitemap.java 2000/09/28 19:14:05 1.1.2.9
@@ -28,7 +28,7 @@
* Base class for generated <code>Sitemap</code> classes
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.8 $ $Date: 2000/09/16 00:20:21 $
+ * @version CVS $Revision: 1.1.2.9 $ $Date: 2000/09/28 19:14:05 $
*/
public abstract class AbstractSitemap implements Sitemap {
@@ -36,7 +36,7 @@
protected ComponentManager manager = null;
/** The sitemap manager instance */
- protected SitemapManager sitemapManager = null;
+ protected Manager sitemapManager = null;
/** The creation date */
protected static long dateCreated = -1L;
No revision
No revision
1.1.2.1 +94 -0
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Manager.java
1.1.2.1 +163 -0
xml-cocoon/src/org/apache/cocoon/sitemap/Attic/Handler.java
No revision
No revision
1.1.2.39 +29 -13
xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -r1.1.2.38 -r1.1.2.39
--- sitemap.xsl 2000/09/27 22:54:19 1.1.2.38
+++ sitemap.xsl 2000/09/28 19:14:09 1.1.2.39
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.38 $ $Date: 2000/09/27 22:54:19 $
+ * @version CVS $Revision: 1.1.2.39 $ $Date: 2000/09/28 19:14:09 $
-->
<!-- Sitemap Core logicsheet for the Java language -->
@@ -60,7 +60,7 @@
import org.apache.cocoon.sitemap.ResourcePipeline;
import org.apache.cocoon.sitemap.Sitemap;
import org.apache.cocoon.sitemap.ErrorNotifier;
- import org.apache.cocoon.sitemap.SitemapManager;
+ import org.apache.cocoon.sitemap.Manager;
import org.apache.cocoon.transformation.Transformer;
import org.xml.sax.SAXException;
@@ -174,7 +174,7 @@
Configuration cconf = null;
AttributesImpl attr = new AttributesImpl();
- this.sitemapManager = new SitemapManager();
+ this.sitemapManager = new Manager();
this.sitemapManager.setComponentManager(this.manager);
this.sitemapManager.setConfiguration(conf);
try {
@@ -482,6 +482,14 @@
<xsl:with-param name="method">setGenerator</xsl:with-param>
<xsl:with-param name="prefix">generator</xsl:with-param>
</xsl:call-template>
+ <xsl:variable name="view-position-first-name">
+ <xsl:value-of select="/map:sitemap/map:views/map:[EMAIL
PROTECTED]'first']/@name"/>
+ </xsl:variable>
+ <xsl:if test="$view-position-first-name">
+ <xsl:if test="not(ancestor::map:view)">
+ if(true)return view_<xsl:value-of
select="translate($view-position-first-name, '- ', '__')"/> (pipeline,
listOfLists, environment);
+ </xsl:if>
+ </xsl:if>
</xsl:template> <!-- match="map:generate" -->
<xsl:template match="map:transform">
@@ -493,6 +501,14 @@
</xsl:template> <!-- match="map:transformer" -->
<xsl:template match="map:serialize">
+ <xsl:variable name="view-position-last-name">
+ <xsl:value-of select="/map:sitemap/map:views/map:[EMAIL
PROTECTED]'last']/@name"/>
+ </xsl:variable>
+ <xsl:if test="$view-position-last-name">
+ <xsl:if test="not(ancestor::map:view)">
+ if(true)return view_<xsl:value-of
select="translate($view-position-last-name, '- ', '__')"/> (pipeline,
listOfLists, environment);
+ </xsl:if>
+ </xsl:if>
<xsl:variable name="default-serializer-type">
<xsl:value-of
select="/map:sitemap/map:components/map:serializers/@default"/>
</xsl:variable>
@@ -527,7 +543,7 @@
<xsl:if test="@status-code">
environment.setStatus(<xsl:value-of select="@status-code"/>);
</xsl:if>
- if(1==1)return pipeline.process (environment);
+ if(true)return pipeline.process (environment);
</xsl:template> <!-- match="map:serialize" -->
<xsl:template match="map:read">
@@ -562,7 +578,7 @@
</xsl:choose>
</xsl:with-param>
</xsl:call-template>
- if(1==1)return pipeline.process (environment);
+ if(true)return pipeline.process (environment);
</xsl:template> <!-- match="map:read" -->
<xsl:template match="map:mount">
@@ -585,18 +601,18 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="substring(@uri-prefix,string-length(@uri-prefix))='/'">
- if(1==1)return sitemapManager.invoke (environment,
substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>"),
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
+ if(true)return sitemapManager.invoke (environment,
substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>"),
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
</xsl:when>
<xsl:when test="substring(@uri-prefix,string-length(@uri-prefix))='}'">
String uri_prefix<xsl:value-of
select="count(.)"/>=substitute(listOfLists,"<xsl:value-of
select="@uri-prefix"/>");
if (uri_prefix<xsl:value-of
select="count(.)"/>.charAt(uri_prefix<xsl:value-of
select="count(.)"/>.length()-1)=='/'){
- if(1==1)return sitemapManager.invoke (environment,
uri_prefix<xsl:value-of select="count(.)"/>,
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
+ if(true)return sitemapManager.invoke (environment,
uri_prefix<xsl:value-of select="count(.)"/>,
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
} else {
- if(1==1)return sitemapManager.invoke (environment,
uri_prefix<xsl:value-of select="count(.)"/>+"/",
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
+ if(true)return sitemapManager.invoke (environment,
uri_prefix<xsl:value-of select="count(.)"/>+"/",
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
}
</xsl:when>
<xsl:otherwise>
- if(1==1)return sitemapManager.invoke (environment,
substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>/"),
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
+ if(true)return sitemapManager.invoke (environment,
substitute(listOfLists,"<xsl:value-of select="@uri-prefix"/>/"),
substitute(listOfLists,"<xsl:value-of select="@src"/>"), <xsl:value-of
select="$check-reload"/>);
</xsl:otherwise>
</xsl:choose>
</xsl:template> <!-- match="map:mount" -->
@@ -604,11 +620,11 @@
<xsl:template match="map:redirect-to">
<xsl:choose>
<xsl:when test="@resource">
- if(1==1)return resource_<xsl:value-of select="translate(@resource,
'- ', '__')"/>(pipeline, listOfLists, environment, cocoon_view);
+ if(true)return resource_<xsl:value-of select="translate(@resource,
'- ', '__')"/>(pipeline, listOfLists, environment, cocoon_view);
</xsl:when>
<xsl:when test="@uri">
environment.redirect (substitute(listOfLists, "<xsl:value-of
select="@uri"/>"));
- if(1==1)return true;
+ if(true)return true;
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="error">
@@ -621,7 +637,7 @@
<xsl:template match="map:label">
<xsl:apply-templates/>
if ("<xsl:value-of select="@name"/>".equals(cocoon_view))
- if(1==1)return view_<xsl:value-of select="translate(@name, '- ',
'__')"/> (pipeline, listOfLists, environment);
+ if(true)return view_<xsl:value-of select="translate(@name, '- ',
'__')"/> (pipeline, listOfLists, environment);
</xsl:template> <!-- match="map:label" -->
<xsl:template match="map:pipeline//parameter">
@@ -808,7 +824,7 @@
<xsl:if test="$component-label">
<xsl:for-each select="/map:sitemap/map:views/map:[EMAIL PROTECTED]">
if ("<xsl:value-of select="@name"/>".equals(cocoon_view)) {
- if(1==1)return view_<xsl:value-of select="translate(@name, '- ',
'__')"/> (pipeline, listOfLists, environment);
+ if(true)return view_<xsl:value-of select="translate(@name, '- ',
'__')"/> (pipeline, listOfLists, environment);
}
</xsl:for-each>
</xsl:if>
