vgritsenko 01/08/11 09:45:21
Modified: src/org/apache/cocoon/environment Context.java
src/org/apache/cocoon/components/language/generator Tag:
cocoon_20_branch ProgramGeneratorImpl.java
Log:
- add getReealPath() to Context
- fix package name generation for in-context resources
Revision Changes Path
1.3 +3 -1
xml-cocoon2/src/org/apache/cocoon/environment/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/environment/Context.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Context.java 2001/06/22 14:11:02 1.2
+++ Context.java 2001/08/11 16:45:21 1.3
@@ -15,7 +15,7 @@
* Defines an interface to provide client context information .
*
* @author <a href="mailto:[EMAIL PROTECTED]">Davanum Srinivas</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/06/22 14:11:02 $
+ * @version CVS $Revision: 1.3 $ $Date: 2001/08/11 16:45:21 $
*
*/
@@ -24,6 +24,8 @@
Object getAttribute(String name);
URL getResource(String path) throws MalformedURLException;
+
+ String getRealPath(String path) throws MalformedURLException;
String getMimeType(String file);
No revision
No revision
1.5.2.12 +4 -2
xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java
Index: ProgramGeneratorImpl.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/generator/ProgramGeneratorImpl.java,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -r1.5.2.11 -r1.5.2.12
--- ProgramGeneratorImpl.java 2001/08/05 18:23:36 1.5.2.11
+++ ProgramGeneratorImpl.java 2001/08/11 16:45:21 1.5.2.12
@@ -50,7 +50,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.5.2.11 $ $Date: 2001/08/05 18:23:36 $
+ * @version CVS $Revision: 1.5.2.12 $ $Date: 2001/08/11 16:45:21 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -98,7 +98,8 @@
org.apache.cocoon.environment.Context ctx =
(org.apache.cocoon.environment.Context)
context.get(Constants.CONTEXT_ENVIRONMENT_CONTEXT);
try {
- this.contextDir = ctx.getResource("").toExternalForm();
+ this.contextDir = new
File(ctx.getRealPath("/")).toURL().toExternalForm();
+ getLogger().debug("Context directory is " + this.contextDir);
} catch (MalformedURLException e) {
getLogger().warn("Could not get context directory", e);
this.contextDir = "";
@@ -164,6 +165,7 @@
contextFilename.append(id.substring(this.contextDir.length()));
} else {
// VG: File is located outside of contextDir, using systemId
+ getLogger().debug("Loading from external source " + id);
contextFilename.append(id);
}
String normalizedName =
IOUtils.normalizedFilename(contextFilename.toString());
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
