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 2009/02/11 22:55:45 UTC
svn commit: r743524 - in /lenya/trunk/org.apache.lenya.core.impl: ./
src/main/java/org/apache/lenya/cms/publication/
src/main/resources/META-INF/cocoon/spring/
src/test/java/org/apache/lenya/cms/publication/
Author: andreas
Date: Wed Feb 11 21:55:44 2009
New Revision: 743524
URL: http://svn.apache.org/viewvc?rev=743524&view=rev
Log:
Fixing PublicationTest.
Modified:
lenya/trunk/org.apache.lenya.core.impl/pom.xml
lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
lenya/trunk/org.apache.lenya.core.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java
Modified: lenya/trunk/org.apache.lenya.core.impl/pom.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/pom.xml?rev=743524&r1=743523&r2=743524&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/pom.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/pom.xml Wed Feb 11 21:55:44 2009
@@ -50,7 +50,27 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/lenya-core-impl-components.xml</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/lenya-core-impl-components.xml</include>
+ </includes>
+ </resource>
+ </resources>
</build>
+
+ <properties>
+ <lenya.home>${basedir}/..</lenya.home>
+ </properties>
<dependencies>
<dependency>
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java?rev=743524&r1=743523&r2=743524&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/java/org/apache/lenya/cms/publication/PublicationConfiguration.java Wed Feb 11 21:55:44 2009
@@ -18,6 +18,10 @@
package org.apache.lenya.cms.publication;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -333,7 +337,25 @@
* @see org.apache.lenya.cms.publication.Publication#getContentDirectory(String)
*/
public File getContentDirectory(String area) {
- return new File(getContentDir(), area);
+ String urlString = getContentDir();
+ File contentDir = getFileFromUrl(urlString);
+ return new File(contentDir, area);
+ }
+
+ protected File getFileFromUrl(String urlString) {
+ if (urlString.startsWith("/")) {
+ return new File(urlString);
+ }
+ File contentDir;
+ try {
+ URL url = new URL(urlString);
+ contentDir = new File(url.toURI());
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ return contentDir;
}
/**
@@ -522,7 +544,8 @@
}
protected String getDefaultContentDir() {
- return getPubBaseUri() + "/" + getId() + "/" + CONTENT_PATH;
+ File baseDir = getFileFromUrl(getPubBaseUri());
+ return baseDir.getAbsolutePath() + File.separator + getId() + File.separator + CONTENT_PATH;
}
/**
Modified: lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml?rev=743524&r1=743523&r2=743524&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/main/resources/META-INF/cocoon/spring/lenya-core-impl-components.xml Wed Feb 11 21:55:44 2009
@@ -38,7 +38,7 @@
class="org.apache.lenya.cms.publication.PublicationManagerImpl">
<property name="nodeFactory" ref="org.apache.lenya.cms.repository.NodeFactory"/>
<property name="sourceResolver" ref="org.apache.excalibur.source.SourceResolver"/>
- <property name="pubBaseUri" value="resource://pubs"/>
+ <property name="pubBaseUri" value="file://${lenya.home}/pubs"/>
</bean>
<bean name="org.apache.lenya.cms.metadata.MetaDataRegistry"
Modified: lenya/trunk/org.apache.lenya.core.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java
URL: http://svn.apache.org/viewvc/lenya/trunk/org.apache.lenya.core.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java?rev=743524&r1=743523&r2=743524&view=diff
==============================================================================
--- lenya/trunk/org.apache.lenya.core.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java (original)
+++ lenya/trunk/org.apache.lenya.core.impl/src/test/java/org/apache/lenya/cms/publication/PublicationTest.java Wed Feb 11 21:55:44 2009
@@ -40,7 +40,7 @@
}
}
- protected void doTestPublication(Publication pub) throws PublicationException {
+ protected void doTestPublication(Publication pub) throws Exception {
String contentDirPath = pub.getContentDir();
assertNotNull(contentDirPath);
@@ -53,8 +53,11 @@
Area area = pub.getArea(areaNames[i]);
if (area.getDocuments().length > 0) {
File areaContentDir = pub.getContentDirectory(areaNames[i]);
+ if (!areaContentDir.isDirectory())
+ throw new RuntimeException("" + areaContentDir);
assertTrue(areaContentDir.isDirectory());
- assertEquals(new File(contentDir, areaNames[i]), areaContentDir);
+ assertEquals(new File(contentDir, areaNames[i]).getCanonicalFile(), areaContentDir
+ .getCanonicalFile());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org