You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/07/19 14:48:34 UTC
svn commit: r557603 - in /lenya/trunk/src:
impl/java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publication/
modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/
modules/blog/config/cocoon-xconf/ modules/blog/java/s...
Author: andreas
Date: Thu Jul 19 05:48:31 2007
New Revision: 557603
URL: http://svn.apache.org/viewvc?view=rev&rev=557603
Log:
Fixed mime-type handling, added mime-type attribute for resource type samples
Modified:
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf
lenya/trunk/src/modules/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf
lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf
lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java
lenya/trunk/src/modules/export/java/src/org/apache/lenya/cms/export/Importer.java
lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf
lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java
lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
lenya/trunk/src/pubs/default/example-content/concepts/index_de.meta
lenya/trunk/src/pubs/default/example-content/concepts/index_en.meta
lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_de.meta
lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_en.meta
lenya/trunk/src/pubs/default/example-content/doctypes/index_de.meta
lenya/trunk/src/pubs/default/example-content/doctypes/index_en.meta
lenya/trunk/src/pubs/default/example-content/doctypes/links/index_de.meta
lenya/trunk/src/pubs/default/example-content/doctypes/links/index_en.meta
lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_de.meta
lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_en.meta
lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_de.meta
lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_en.meta
lenya/trunk/src/pubs/default/example-content/features/index_de.meta
lenya/trunk/src/pubs/default/example-content/features/index_en.meta
lenya/trunk/src/pubs/default/example-content/index/index_de.meta
lenya/trunk/src/pubs/default/example-content/index/index_en.meta
lenya/trunk/src/pubs/default/example-content/links/index_de.meta
lenya/trunk/src/pubs/default/example-content/links/index_en.meta
lenya/trunk/src/pubs/default/example-content/news/index_de.meta
lenya/trunk/src/pubs/default/example-content/news/index_en.meta
lenya/trunk/src/pubs/default/example-content/news/installed/index_de.meta
lenya/trunk/src/pubs/default/example-content/news/installed/index_en.meta
lenya/trunk/src/pubs/default/example-content/search/index_de.meta
lenya/trunk/src/pubs/default/example-content/search/index_en.meta
lenya/trunk/src/pubs/default/example-content/tutorial/index_de.meta
lenya/trunk/src/pubs/default/example-content/tutorial/index_en.meta
lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
lenya/trunk/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl
lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl
lenya/trunk/src/webapp/lenya/config/cocoon-xconf/metadata/document.xconf
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Thu Jul 19 05:48:31 2007
@@ -75,7 +75,7 @@
Document document = add(sourceDocument.getFactory(), sourceDocument.getResourceType(),
sourceDocument.getInputStream(), sourceDocument.getPublication(), area, path,
- language, extension, navigationTitle, visibleInNav);
+ language, extension, navigationTitle, visibleInNav, sourceDocument.getMimeType());
copyMetaData(sourceDocument, document);
return document;
@@ -137,7 +137,7 @@
protected Document add(DocumentFactory factory, ResourceType documentType,
InputStream initialContentsStream, Publication pub, String area, String path,
- String language, String extension, String navigationTitle, boolean visibleInNav)
+ String language, String extension, String navigationTitle, boolean visibleInNav, String mimeType)
throws DocumentBuildException, DocumentException, PublicationException {
Area areaObj = pub.getArea(area);
@@ -148,7 +148,7 @@
}
Document document = add(factory, documentType, initialContentsStream, pub, area, language,
- extension);
+ extension, mimeType);
addToSiteManager(path, document, navigationTitle, visibleInNav);
return document;
@@ -166,7 +166,7 @@
resolver = (SourceResolver) this.manager.lookup(SourceResolver.ROLE);
source = resolver.resolveURI(initialContentsURI);
return add(factory, documentType, uuid, source.getInputStream(), pub, area, language,
- extension);
+ extension, getMimeType(source));
} catch (Exception e) {
throw new PublicationException(e);
} finally {
@@ -179,18 +179,26 @@
}
}
+ protected String getMimeType(Source source) {
+ String mimeType = source.getMimeType();
+ if (mimeType == null) {
+ mimeType = "";
+ }
+ return mimeType;
+ }
+
protected Document add(DocumentFactory factory, ResourceType documentType,
InputStream initialContentsStream, Publication pub, String area, String language,
- String extension) throws DocumentBuildException, DocumentException,
+ String extension, String mimeType) throws DocumentBuildException, DocumentException,
PublicationException {
String uuid = generateUUID();
return add(factory, documentType, uuid, initialContentsStream, pub, area, language,
- extension);
+ extension, mimeType);
}
protected Document add(DocumentFactory factory, ResourceType documentType, String uuid,
- InputStream stream, Publication pub, String area, String language, String extension)
+ InputStream stream, Publication pub, String area, String language, String extension, String mimeType)
throws DocumentBuildException {
try {
@@ -205,6 +213,7 @@
document.setResourceType(documentType);
document.setSourceExtension(extension);
+ document.setMimeType(mimeType);
// Write Lenya-internal meta-data
MetaData lenyaMetaData = document.getMetaData(DocumentImpl.METADATA_NAMESPACE);
@@ -936,7 +945,8 @@
throws DocumentBuildException, DocumentException, PublicationException {
Document document = add(sourceDocument.getFactory(), sourceDocument.getResourceType(),
sourceDocument.getUUID(), sourceDocument.getInputStream(), sourceDocument
- .getPublication(), area, language, sourceDocument.getSourceExtension());
+ .getPublication(), area, language, sourceDocument.getSourceExtension(),
+ sourceDocument.getMimeType());
copyMetaData(sourceDocument, document);
return document;
Modified: lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java (original)
+++ lenya/trunk/src/impl/java/org/apache/lenya/cms/publication/ResourceTypeImpl.java Thu Jul 19 05:48:31 2007
@@ -46,6 +46,7 @@
protected static final String ATTRIBUTE_XPATH = "xpath";
protected static final String SAMPLE_NAME = "sample-name";
protected static final String SAMPLE_NAME_ATTRIBUTE = "name";
+ protected static final String SAMPLE_MIME_TYPE_ATTRIBUTE = "mime-type";
protected static final String ELEMENT_FORMAT = "format";
protected static final String ATTRIBUTE_URI = "uri";
protected static final String ATTRIBUTE_NAME = "name";
@@ -59,7 +60,7 @@
public static final String DEFAULT_SAMPLE_NAME = "Default Sample";
private Schema schema = null;
- private Sample[] samples;
+ private Map samples;
private String[] linkAttributeXPaths;
private long expires = 0;
@@ -80,11 +81,12 @@
// determine the sample content locations.
Configuration[] samplesConf = config.getChildren(SAMPLE_NAME);
- this.samples = new Sample[samplesConf.length];
+ this.samples = new HashMap();
for (int i = 0; i < samplesConf.length; i++) {
String name = samplesConf[i].getAttribute(SAMPLE_NAME_ATTRIBUTE, DEFAULT_SAMPLE_NAME);
+ String mimeType = samplesConf[i].getAttribute(SAMPLE_MIME_TYPE_ATTRIBUTE);
String uri = samplesConf[i].getValue();
- this.samples[i] = new Sample(name, uri);
+ this.samples.put(name, new Sample(name, mimeType, uri));
}
Configuration[] rewriteAttributeConfigs = config.getChildren(ELEMENT_REWRITE_ATTRIBUTE);
@@ -128,21 +130,15 @@
}
public String[] getSampleNames() {
- String[] names = new String[this.samples.length];
- for (int i = 0; i < names.length; i++) {
- names[i] = this.samples[i].getName();
- }
- return names;
+ Set names = this.samples.keySet();
+ return (String[]) names.toArray(new String[names.size()]);
}
-
- public String getSampleURI(String name) {
- for (int i = 0; i < this.samples.length; i++) {
- if (this.samples[i].getName().equals(name)) {
- return this.samples[i].getUri();
- }
+
+ public Sample getSample(String name) {
+ if (!this.samples.containsKey(name)) {
+ throw new IllegalArgumentException("No sample with name [" + name + "] found.");
}
- throw new IllegalArgumentException("The resource type [" + getName()
- + "] doesn't support the sample [" + name + "]!");
+ return (Sample) this.samples.get(name);
}
public void setName(String name) {
@@ -173,41 +169,6 @@
return ((Format) this.formats.get(format)).getURI();
}
- /**
- * A sample.
- */
- public static class Sample {
-
- private String name;
- private String uri;
-
- /**
- * @param name The name.
- * @param uri The URI.
- */
- public Sample(String name, String uri) {
- Assert.notNull("name", name);
- this.name = name;
- Assert.notNull("uri", uri);
- this.uri = uri;
- }
-
- /**
- * @return The name.
- */
- public String getName() {
- return this.name;
- }
-
- /**
- * @return The URI.
- */
- public String getUri() {
- return this.uri;
- }
-
- }
-
/**
* A format.
*/
Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/ResourceType.java Thu Jul 19 05:48:31 2007
@@ -35,30 +35,34 @@
package org.apache.lenya.cms.publication;
import java.util.Date;
+
+import org.apache.lenya.util.Assert;
import org.apache.lenya.xml.Schema;
/**
* @version $Id:$
*/
public interface ResourceType {
-
+
/**
* The Avalon service role.
*/
String ROLE = ResourceType.class.getName();
-
+
/**
* Prefix for translating the resource type name, e.g.
- * <i18n:text>resourceType-<jx:out value="${resourceType.getName()}"/></i18n:text>
+ * <i18n:text>resourceType-<jx:out
+ * value="${resourceType.getName()}"/></i18n:text>
*/
String I18N_PREFIX = "resourceType-";
-
+
/**
- * Returns the date at which point the requested resource is considered expired
+ * Returns the date at which point the requested resource is considered
+ * expired
* @return a string in RFC 1123 date format
*/
Date getExpires();
-
+
/**
* Returns the name of this document type.
* @return A string value.
@@ -71,40 +75,78 @@
Schema getSchema();
/**
- * Returns an array of XPaths representing attributes to be rewritten
- * when a document URL has changed.
+ * Returns an array of XPaths representing attributes to be rewritten when a
+ * document URL has changed.
* @return An array of strings.
*/
String[] getLinkAttributeXPaths();
/**
- * Returns the a sample contents and their names for this type
- * @return A set of the sample names
+ * @return The names of all available samples. The first one is the default sample.
*/
String[] getSampleNames();
-
+
/**
- * Returns the location of sample contents for this type
- * @param name The name of the sample.
- * @return A string value.
- * @see #getSampleNames()
+ * @param name The name.
+ * @return The sample with the specified name.
*/
- String getSampleURI(String name);
-
+ Sample getSample(String name);
+
/**
* @param name The name of the resource type.
*/
void setName(String name);
-
+
/**
* @return All supported formats.
*/
String[] getFormats();
-
+
/**
* @param format The format.
* @return The URI to get the formatted content at.
*/
String getFormatURI(String format);
-
+
+ /**
+ * A resource type sample.
+ */
+ public static class Sample {
+
+ protected Sample(String name, String mimeType, String uri) {
+ Assert.notNull("name", name);
+ this.name = name;
+ Assert.notNull("mimeType", mimeType);
+ this.mimeType = mimeType;
+ Assert.notNull("uri", uri);
+ this.uri = uri;
+ }
+
+ private String name;
+ private String mimeType;
+ private String uri;
+
+ /**
+ * @return The name of the sample.
+ */
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ * @return The MIME type of the sample.
+ */
+ public String getMimeType() {
+ return this.mimeType;
+ }
+
+ /**
+ * @return The URI of the sample source.
+ */
+ public String getUri() {
+ return this.uri;
+ }
+
+ }
+
}
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Create.java Thu Jul 19 05:48:31 2007
@@ -173,11 +173,12 @@
selector = (ServiceSelector) this.manager
.lookup(ResourceType.ROLE + "Selector");
resourceType = (ResourceType) selector.select(getDocumentTypeName());
- String sample = getParameterAsString(SAMPLE, resourceType.getSampleNames()[0]);
- String sampleUri = resourceType.getSampleURI(sample);
- document = documentManager.add(getDocumentFactory(), resourceType, sampleUri,
+ String sampleName = getParameterAsString(SAMPLE, resourceType.getSampleNames()[0]);
+ ResourceType.Sample sample = resourceType.getSample(sampleName);
+ document = documentManager.add(getDocumentFactory(), resourceType, sample.getUri(),
getPublication(), getArea(), getNewDocumentPath(), language,
getSourceExtension(), title, getVisibleInNav());
+ document.setMimeType(sample.getMimeType());
} else {
document = documentManager.add(initialDocument, getArea(),
getNewDocumentPath(), language, getSourceExtension(), title,
Modified: lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf (original)
+++ lenya/trunk/src/modules/blog/config/cocoon-xconf/resourcetypes.xconf Thu Jul 19 05:48:31 2007
@@ -27,7 +27,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/entry.rng"/>
- <sample-name>fallback://lenya/modules/blog/resources/samples/entry.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/blog/resources/samples/entry.xml</sample-name>
</component-instance>
<component-instance name="sidebar"
@@ -35,7 +35,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/sidebar.rng"/>
- <sample-name>fallback://lenya/modules/blog/samples/sidebar.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/blog/samples/sidebar.xml</sample-name>
</component-instance>
<component-instance name="feed"
@@ -43,7 +43,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/blog/resources/schemas/feed.rng"/>
- <sample-name>fallback://lenya/modules/blog/resources/samples/feed.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/blog/resources/samples/feed.xml</sample-name>
</component-instance>
</xconf>
Modified: lenya/trunk/src/modules/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java (original)
+++ lenya/trunk/src/modules/blog/java/src/org/apache/lenya/cms/site/usecases/CreateBlogEntry.java Thu Jul 19 05:48:31 2007
@@ -122,7 +122,8 @@
String documentId = getDocumentID();
- String sampleUri = resourceType.getSampleURI(resourceType.getSampleNames()[0]);
+ String sampleName = resourceType.getSampleNames()[0];
+ String sampleUri = resourceType.getSample(sampleName).getUri();
Document document = documentManager.add(map,
resourceType,
Modified: lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/cforms/config/cocoon-xconf/module.xconf Thu Jul 19 05:48:31 2007
@@ -24,7 +24,7 @@
logger="lenya.resourcetypes.cforms"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema src="fallback://lenya/modules/cforms/schemas/cforms.rng" language="http://relaxng.org/ns/structure/0.9"/>
- <sample-name>fallback://lenya/modules/cforms/samples/cforms.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/cforms/samples/cforms.xml</sample-name>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@href"/>
<format name="xhtml" uri="cocoon://modules/cforms/xhtml.xml"/>
</component-instance>
Modified: lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf (original)
+++ lenya/trunk/src/modules/collection/config/cocoon-xconf/resourcetype-collection.xconf Thu Jul 19 05:48:31 2007
@@ -23,8 +23,8 @@
<component-instance name="collection"
logger="lenya.resourcetypes.collectoin"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
- <sample-name name="Manual">fallback://lenya/modules/collection/samples/collection.xml</sample-name>
- <sample-name name="Children">fallback://lenya/modules/collection/samples/children.xml</sample-name>
+ <sample-name name="Manual" mime-type="application/xml">fallback://lenya/modules/collection/samples/collection.xml</sample-name>
+ <sample-name name="Children" mime-type="application/xml">fallback://lenya/modules/collection/samples/children.xml</sample-name>
<format name="collection" uri="cocoon://modules/collection/collection.xml"/>
</component-instance>
Modified: lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java (original)
+++ lenya/trunk/src/modules/collection/java/test/org/apache/lenya/modules/collection/CollectionWrapperTest.java Thu Jul 19 05:48:31 2007
@@ -99,8 +99,10 @@
typeSelector = (ServiceSelector) getManager().lookup(ResourceType.ROLE + "Selector");
type = (ResourceType) typeSelector.select("collection");
docMgr = (DocumentManager) getManager().lookup(DocumentManager.ROLE);
- String sampleUri = type.getSampleURI(type.getSampleNames()[0]);
- doc = docMgr.add(getFactory(), type, sampleUri, pub, "authoring", "en", "xml");
+ ResourceType.Sample sample = type.getSample(type.getSampleNames()[0]);
+ doc = docMgr.add(getFactory(), type, sample.getUri(), pub, "authoring", "en", "xml");
+ doc.setMimeType(sample.getMimeType());
+
} finally {
if (docMgr != null) {
getManager().release(docMgr);
Modified: lenya/trunk/src/modules/export/java/src/org/apache/lenya/cms/export/Importer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/export/java/src/org/apache/lenya/cms/export/Importer.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/export/java/src/org/apache/lenya/cms/export/Importer.java (original)
+++ lenya/trunk/src/modules/export/java/src/org/apache/lenya/cms/export/Importer.java Thu Jul 19 05:48:31 2007
@@ -124,6 +124,9 @@
Element resourceTypeElement = helper.getFirstChild(internalElement, "resourceType");
String resourceTypeName = DocumentHelper.getSimpleElementText(resourceTypeElement);
+ Element mimeTypeElement = helper.getFirstChild(internalElement, "mimeType");
+ String mimeType = DocumentHelper.getSimpleElementText(mimeTypeElement);
+
selector = (ServiceSelector) this.manager.lookup(ResourceType.ROLE + "Selector");
resourceType = (ResourceType) selector.select(resourceTypeName);
@@ -134,6 +137,7 @@
newDoc = docManager.add(area.getPublication().getFactory(), resourceType,
contentUri, area.getPublication(), area.getName(), path, language, "xml",
navigationTitle, visibleInNav);
+ newDoc.setMimeType(mimeType);
} else {
SiteNode node = site.getNode(path);
Document doc = node.getLink(node.getLanguages()[0]).getDocument();
Modified: lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf (original)
+++ lenya/trunk/src/modules/links/config/cocoon-xconf/resource-type-links.xconf Thu Jul 19 05:48:31 2007
@@ -25,7 +25,7 @@
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/links/resources/schema/links.rng"/>
- <sample-name>fallback://lenya/modules/links/samples/links.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/links/samples/links.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/links/xhtml.xml"/>
<format name="luceneIndex" uri="cocoon://modules/xhtml/lucene-index"/>
<format name="webdavGET" uri="cocoon://modules/xhtml/davget.xml"/>
Modified: lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf (original)
+++ lenya/trunk/src/modules/news/config/cocoon-xconf/resourcetype-news.xconf Thu Jul 19 05:48:31 2007
@@ -27,7 +27,7 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="3600" />
- <sample-name>fallback://lenya/modules/news/samples/news.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/news/samples/news.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/news/xhtml.xml"/>
<format name="include" uri="cocoon://modules/news/include.xml"/>
<format name="rss" uri="cocoon://modules/news/rss.xml"/>
Modified: lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf (original)
+++ lenya/trunk/src/modules/opendocument/config/cocoon-xconf/resource-type-opendocument.xconf Thu Jul 19 05:48:31 2007
@@ -23,7 +23,7 @@
<component-instance name="opendocument"
logger="lenya.resourcetypes.opendocument"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
- <sample-name>fallback://lenya/modules/opendocument/samples/helloworld.odt</sample-name>
+ <sample-name mime-type="application/vnd.oasis.opendocument.text">fallback://lenya/modules/opendocument/samples/helloworld.odt</sample-name>
<!-- NOTE: Will be matched within sitemap of this module (modules/opendocument/sitemap.xmap) -->
<format name="xhtml" uri="cocoon://modules/opendocument/xhtml.xml"/>
<format name="webdavGET" uri="cocoon://modules/opendocument/davget.xml"/>
Modified: lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf (original)
+++ lenya/trunk/src/modules/resource/config/cocoon-xconf/module.xconf Thu Jul 19 05:48:31 2007
@@ -24,7 +24,7 @@
logger="lenya.resourcetypes.resource"
class="org.apache.lenya.cms.publication.ResourceTypeImpl">
<schema src="fallback://lenya/modules/resource/resources/schemas/resource.rng" language="http://relaxng.org/ns/structure/0.9"/>
- <sample-name>fallback://lenya/modules/resource/samples/resource.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/resource/samples/resource.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/resource/xhtml.xml"/>
<format name="downloadLink" uri="cocoon://modules/resource/downloadLink.xml"/>
<format name="icon" uri="cocoon://modules/resource/icon"/>
Modified: lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java (original)
+++ lenya/trunk/src/modules/resource/java/test/org/apache/lenya/cms/publication/ResourceWrapperTest.java Thu Jul 19 05:48:31 2007
@@ -119,9 +119,10 @@
selector = (ServiceSelector) manager.lookup(ResourceType.ROLE + "Selector");
resourceType = (ResourceType) selector.select("resource");
- String sampleUri = resourceType.getSampleURI(resourceType.getSampleNames()[0]);
- doc = docManager.add(factory, resourceType, sampleUri, pub, Publication.AUTHORING_AREA,
+ ResourceType.Sample sample = resourceType.getSample(resourceType.getSampleNames()[0]);
+ doc = docManager.add(factory, resourceType, sample.getUri(), pub, Publication.AUTHORING_AREA,
path, pub.getDefaultLanguage(), extension, "Test Resource", true);
+ doc.setMimeType(sample.getMimeType());
ResourceWrapper resource = new ResourceWrapper(doc, manager, logger);
resource.write(IMAGE_URL);
Modified: lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf (original)
+++ lenya/trunk/src/modules/usecasedocument/config/cocoon-xconf/resource-type-usecase.xconf Thu Jul 19 05:48:31 2007
@@ -26,7 +26,7 @@
<schema language="http://relaxng.org/ns/structure/0.9"
src="fallback://lenya/modules/usecasedocument/resources/schemas/usecase.rng"/>
- <sample-name>fallback://lenya/modules/usecasedocument/samples/usecase.xml</sample-name>
+ <sample-name mime-type="application/xml">fallback://lenya/modules/usecasedocument/samples/usecase.xml</sample-name>
<format name="xhtml" uri="cocoon://modules/usecasedocument/usecase.xml"/>
</component-instance>
Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java (original)
+++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Mkcol.java Thu Jul 19 05:48:31 2007
@@ -81,9 +81,10 @@
String path = doc.getPath();
resourceType = (ResourceType) selector.select(TYPE);
- String sampleUri = resourceType.getSampleURI(resourceType.getSampleNames()[0]);
- doc = documentManager.add(map, resourceType, sampleUri, getPublication(), doc
+ ResourceType.Sample sample = resourceType.getSample(resourceType.getSampleNames()[0]);
+ doc = documentManager.add(map, resourceType, sample.getUri(), getPublication(), doc
.getArea(), path, doc.getLanguage(), EXTENSION, doc.getName(), true);
+ doc.setMimeType(sample.getMimeType());
setMetaData(doc);
} finally {
Modified: lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java (original)
+++ lenya/trunk/src/modules/webdav/java/src/org/apache/lenya/cms/usecases/webdav/Put.java Thu Jul 19 05:48:31 2007
@@ -124,9 +124,10 @@
String path = doc.getPath();
// lookupResourceType(extension)
resourceType = lookUpExtension(extension, selector);
- String sampleUri = resourceType.getSampleURI(resourceType.getSampleNames()[0]);
- doc = documentManager.add(map, resourceType, sampleUri, getPublication(), doc
+ ResourceType.Sample sample = resourceType.getSample(resourceType.getSampleNames()[0]);
+ doc = documentManager.add(map, resourceType, sample.getUri(), getPublication(), doc
.getArea(), path, doc.getLanguage(), extension, doc.getName(), true);
+ doc.setMimeType(sample.getMimeType());
setMetaData(doc);
} finally {
if (documentManager != null) {
Modified: lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf (original)
+++ lenya/trunk/src/modules/xhtml/config/cocoon-xconf/resource-type-xhtml.xconf Thu Jul 19 05:48:31 2007
@@ -29,8 +29,8 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="3600" />
- <sample-name>fallback://lenya/modules/xhtml/samples/xhtml.xml</sample-name>
- <!-- <sample-name name="Two Column Layout">fallback://lenya/modules/xhtml/samples/xhtml-2col.xml</sample-name> -->
+ <sample-name mime-type="application/xhtml+xml">fallback://lenya/modules/xhtml/samples/xhtml.xml</sample-name>
+ <!-- <sample-name name="Two Column Layout" mime-type="application/xhtml+xml">fallback://lenya/modules/xhtml/samples/xhtml-2col.xml</sample-name> -->
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@href"/>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@data"/>
@@ -41,6 +41,7 @@
<!-- "xslt-clean" format is used by webDAV (and other editors?) to "clean" xml content before it is validated/saved -->
<format name="xslt-clean" uri="fallback://lenya/modules/xhtml/xslt/clean-xhtml.xsl"/>
<format name="icon" uri="cocoon://modules/xhtml/icon"/>
+
</component-instance>
</xconf>
Modified: lenya/trunk/src/pubs/default/example-content/concepts/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/concepts/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/concepts/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/concepts/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya Konzepte kurz erklärt</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/concepts/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/concepts/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/concepts/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/concepts/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya Concepts quickly explained</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_de.meta Thu Jul 19 05:48:31 2007
@@ -13,6 +13,7 @@
<lenya:internal>
<lenya:resourceType>cforms</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/cforms/index_en.meta Thu Jul 19 05:48:31 2007
@@ -13,6 +13,7 @@
<lenya:internal>
<lenya:resourceType>cforms</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Einige Dokumenttyp Beispiele</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Some Resource Type Samples</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/links/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/links/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/links/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/links/index_de.meta Thu Jul 19 05:48:31 2007
@@ -13,6 +13,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/links/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/links/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/links/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/links/index_en.meta Thu Jul 19 05:48:31 2007
@@ -13,6 +13,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_de.meta Thu Jul 19 05:48:31 2007
@@ -11,6 +11,7 @@
<lenya:resourceType>opendocument</lenya:resourceType>
<lenya:contentType>odt</lenya:contentType>
<lenya:extension>odt</lenya:extension>
+ <lenya:mimeType>application/vnd.oasis.opendocument.text</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/opendocument/index_en.meta Thu Jul 19 05:48:31 2007
@@ -11,6 +11,7 @@
<lenya:resourceType>opendocument</lenya:resourceType>
<lenya:contentType>odt</lenya:contentType>
<lenya:extension>odt</lenya:extension>
+ <lenya:mimeType>application/vnd.oasis.opendocument.text</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Der XHTML Dokumenttyp</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/doctypes/xhtml-document/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">The XHTML Resource Type</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/features/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/features/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/features/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/features/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Einige Lenya Funktionen kurz erklärt</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/features/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/features/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/features/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/features/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Some Lenya Features quickly explained</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/index/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/index/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/index/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/index/index_de.meta Thu Jul 19 05:48:31 2007
@@ -24,6 +24,7 @@
<lenya:internal>
<lenya:resourceType>homepage</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Willkommen zur Lenya Standardpublikation</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/index/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/index/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/index/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/index/index_en.meta Thu Jul 19 05:48:31 2007
@@ -24,6 +24,7 @@
<lenya:internal>
<lenya:resourceType>homepage</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Welcome to the Lenya default publication</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/links/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/links/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/links/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/links/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya links</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/links/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/links/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/links/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/links/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>links</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya links</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/news/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/news/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/news/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/news/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>news</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">News</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/news/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/news/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/news/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/news/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>news</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">News</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/news/installed/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/news/installed/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/news/installed/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/news/installed/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya erfolgreich installiert</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/news/installed/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/news/installed/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/news/installed/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/news/installed/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Lenya Successfully Installed</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/search/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/search/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/search/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/search/index_de.meta Thu Jul 19 05:48:31 2007
@@ -17,6 +17,7 @@
<lenya:resourceType>usecase</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
<lenya:extension>xml</lenya:extension>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/search/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/search/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/search/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/search/index_en.meta Thu Jul 19 05:48:31 2007
@@ -17,6 +17,7 @@
<lenya:resourceType>usecase</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
<lenya:extension>xml</lenya:extension>
+ <lenya:mimeType>application/xml</lenya:mimeType>
</lenya:internal>
</lenya:meta>
</lenya:document>
Modified: lenya/trunk/src/pubs/default/example-content/tutorial/index_de.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/tutorial/index_de.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/tutorial/index_de.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/tutorial/index_de.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">Ein kurzes Lenya Tutorial</dc:title>
Modified: lenya/trunk/src/pubs/default/example-content/tutorial/index_en.meta
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/example-content/tutorial/index_en.meta?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/example-content/tutorial/index_en.meta (original)
+++ lenya/trunk/src/pubs/default/example-content/tutorial/index_en.meta Thu Jul 19 05:48:31 2007
@@ -21,6 +21,7 @@
<lenya:internal>
<lenya:resourceType>xhtml</lenya:resourceType>
<lenya:contentType>xml</lenya:contentType>
+ <lenya:mimeType>application/xhtml+xml</lenya:mimeType>
</lenya:internal>
<lenya:dc>
<dc:title xmlns:dc="http://purl.org/dc/elements/1.1/">A short Lenya Tutorial</dc:title>
Modified: lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf (original)
+++ lenya/trunk/src/pubs/default/modules/homepage/config/cocoon-xconf/resource-type-homepage.xconf Thu Jul 19 05:48:31 2007
@@ -28,7 +28,7 @@
<!-- Default time in seconds until the resource-type has expired -->
<expires seconds="0" />
- <sample-name>fallback://lenya/modules/homepage/samples/homepage.xml</sample-name>
+ <sample-name mime-type="application/xhtml+xml">fallback://lenya/modules/homepage/samples/homepage.xml</sample-name>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@href"/>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@data"/>
<link-attribute xpath="//*[namespace-uri() = 'http://www.w3.org/1999/xhtml']/@src"/>
Modified: lenya/trunk/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl (original)
+++ lenya/trunk/src/pubs/default/modules/homepage/xslt/homepage2xhtml.xsl Thu Jul 19 05:48:31 2007
@@ -24,8 +24,12 @@
xmlns:ci="http://apache.org/cocoon/include/1.0"
>
+ <xsl:import href="xhtml2xhtml.xsl"/>
+ <!--
<xsl:import href="fallback://lenya/modules/xhtml/xslt/xhtml2xhtml.xsl"/>
-
+ <xsl:param name="rendertype"/>
+ -->
+
<xsl:param name="pubId"/>
<xsl:param name="contextPath"/>
<xsl:param name="language"/>
@@ -35,7 +39,10 @@
<xsl:copy-of select="lenya:meta"/>
<html>
<head>
+ <!--
<link rel="stylesheet" href="{$contextPath}/{$pubId}/modules/homepage/css/homepage.css" type="text/css"/>
+ -->
+ <link rel="stylesheet" href="/default/authoring/css/page.css" type="text/css"/>
<ci:include src="cocoon:/news-header_{$language}.xml"/>
</head>
<body>
Modified: lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl (original)
+++ lenya/trunk/src/pubs/default/xslt/page2xhtml.xsl Thu Jul 19 05:48:31 2007
@@ -52,7 +52,11 @@
<xsl:template match="cmsbody">
<html>
<head>
+ <!--
<link rel="neutron-introspection" type="application/neutron+xml" href="{$root}{$document-path}/introspection.xml"/>
+ -->
+ <link rel="neutron-introspection" type="application/neutron+xml"
+ href="{$root}{$document-path}.xml?lenya.module=neutron&lenya.action=introspect"/>
<link rel="stylesheet" href="{$root}/css/page.css" type="text/css"/>
<!-- Load doctype-specific CSS -->
<xsl:choose>
Modified: lenya/trunk/src/webapp/lenya/config/cocoon-xconf/metadata/document.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/cocoon-xconf/metadata/document.xconf?view=diff&rev=557603&r1=557602&r2=557603
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/cocoon-xconf/metadata/document.xconf (original)
+++ lenya/trunk/src/webapp/lenya/config/cocoon-xconf/metadata/document.xconf Thu Jul 19 05:48:31 2007
@@ -29,7 +29,7 @@
<element name="contentType" multiple="false"/>
<element name="mimeType" multiple="false"/>
<element name="expires" multiple="false"/>
- <element name="extension" multiple="false"/>
+ <element name="extension" multiple="false"/>
</component-instance>
</xconf>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org