dims 01/07/23 14:57:47
Modified: src/org/apache/cocoon/components/language/generator Tag:
cocoon_20_branch ProgramGeneratorImpl.java
src/org/apache/cocoon/util Tag: cocoon_20_branch
HashMap.java
Log:
- Patch for Bug ID#2737
- Remove extra ;
Revision Changes Path
No revision
No revision
1.5.2.8 +7 -1
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.7
retrieving revision 1.5.2.8
diff -u -r1.5.2.7 -r1.5.2.8
--- ProgramGeneratorImpl.java 2001/07/16 13:23:35 1.5.2.7
+++ ProgramGeneratorImpl.java 2001/07/23 21:57:46 1.5.2.8
@@ -36,6 +36,7 @@
import org.apache.cocoon.components.language.programming.CodeFormatter;
import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
import org.apache.cocoon.components.store.Store;
+import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.Source;
import org.apache.cocoon.util.IOUtils;
@@ -48,7 +49,7 @@
/**
* The default implementation of <code>ProgramGenerator</code>
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.5.2.7 $ $Date: 2001/07/16 13:23:35 $
+ * @version CVS $Revision: 1.5.2.8 $ $Date: 2001/07/23 21:57:46 $
*/
public class ProgramGeneratorImpl extends AbstractLoggable
implements ProgramGenerator, Contextualizable, Composable, Configurable,
ThreadSafe, Disposable {
@@ -141,6 +142,11 @@
// Set filenames
StringBuffer contextFilename = new
StringBuffer(this.rootPackage.replace('.', File.separatorChar));
+ // Add uri if any (for sub-sitemap's)
+ if(resolver instanceof Environment) {
+ contextFilename.append(File.separator);
+ contextFilename.append(((Environment)resolver).getURI());
+ }
contextFilename.append(File.separator);
contextFilename.append(fileName);
String normalizedName =
IOUtils.normalizedFilename(contextFilename.toString());
No revision
No revision
1.1.2.2 +2 -2 xml-cocoon2/src/org/apache/cocoon/util/HashMap.java
Index: HashMap.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/util/HashMap.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- HashMap.java 2001/07/23 16:26:29 1.1.2.1
+++ HashMap.java 2001/07/23 21:57:46 1.1.2.2
@@ -14,7 +14,7 @@
* Extended Version of {@link java.util.HashMap}.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/23 16:26:29 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/07/23 21:57:46 $
*/
public class HashMap extends java.util.HashMap {
@@ -48,7 +48,7 @@
return this.get(key);
} else {
return _default;
- };
+ }
}
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
