cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp XSLTExtension.java
vgritsenko2004/02/10 16:17:34
Modified:src/java/org/apache/cocoon/components/language/markup/xsp
XSLTExtension.java
Log:
Comments
Revision ChangesPath
1.4 +10 -7
cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSLTExtension.java
Index: XSLTExtension.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSLTExtension.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSLTExtension.java24 Oct 2003 01:10:56 - 1.3
+++ XSLTExtension.java11 Feb 2004 00:17:34 - 1.4
@@ -61,7 +61,7 @@
/**
* Escapes '' and '\' characters in a String (add a '\' before them) so
that it can
- * be inserted in java source + quote special characters as utf-8
+ * be inserted in java source + quote special characters as UTF-8
*/
public static String escapeJavaString(String string) {
char chr[] = string.toCharArray();
@@ -109,8 +109,9 @@
}
/**
- * quote special characters as utf-8
- * TC: it's code doublication but that way we don't
+ * Quote special characters as UTF-8
+ *
+ * TC: It's code duplication but that way we don't
* have to iterate through the StringBuffer twice
*/
public static String escapeString(String string) {
@@ -140,17 +141,19 @@
}
/**
- * Escapes '' and '\' characters in a String (add a '\' before them) so
that it can
- * be inserted in java source.
+ * @see #escapeString(String)
*/
public String escape(String string) {
return escapeString(string);
}
+/**
+ * This method used by Java XSP core logicsheet.
+ * @see #escapeJavaString(String)
+ */
public String escapeJava(String string) {
return escapeJavaString(string);
}
-
/**
* Counts amount of spaces in the input line from the beginning
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/javascript xsp.xsl
vgritsenko2004/02/10 16:18:40 Modified: src/java/org/apache/cocoon/components/language/markup/xsp/javascript xsp.xsl Log: Fix bug# 26756 Revision ChangesPath 1.2 +3 -3 cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl Index: xsp.xsl === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/javascript/xsp.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsp.xsl 9 Mar 2003 00:08:59 - 1.1 +++ xsp.xsl 11 Feb 2004 00:18:40 - 1.2 @@ -402,7 +402,7 @@ xsl:value-of select=./ /xsl:when xsl:otherwise -page.xspCharacters(xsl:value-of select=XSLTExtension:escape($extension, .)/); +page.xspCharacters(xsl:value-of select=XSLTExtension:escapeJava($extension, .)/); /xsl:otherwise /xsl:choose /xsl:template
cvs commit: cocoon-2.1/src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/python xsp.xsl
vgritsenko2004/02/10 16:36:30 Modified: src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/python xsp.xsl Log: Fix bug #26756 Revision ChangesPath 1.2 +3 -3 cocoon-2.1/src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl Index: xsp.xsl === RCS file: /home/cvs/cocoon-2.1/src/blocks/python/java/org/apache/cocoon/components/language/markup/xsp/python/xsp.xsl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsp.xsl 9 Mar 2003 00:06:02 - 1.1 +++ xsp.xsl 11 Feb 2004 00:36:29 - 1.2 @@ -666,7 +666,7 @@ xsl:otherwise xsl:value-of select=$zindent/ xsl:textpage.xspCharacters(/xsl:text -xsl:value-of select=XSLTExtension:escape($extension, .)/ +xsl:value-of select=XSLTExtension:escapeJava($extension, .)/ xsl:text) /xsl:text /xsl:otherwise
cvs commit: cocoon-2.1/src/webapp/WEB-INF/entities catalog web-app_2_2.dtd
crossley2004/02/10 20:16:54 Modified:src/webapp/WEB-INF/entities catalog Removed: src/webapp/WEB-INF/entities web-app_2_2.dtd Log: The entity resolver will now deliver the web-app_2_3.dtd when it is asked for the 2_2.dtd so as to avoid potential license issues with the latter. Revision ChangesPath 1.7 +2 -2 cocoon-2.1/src/webapp/WEB-INF/entities/catalog Index: catalog === RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- catalog 7 Feb 2004 18:31:15 - 1.6 +++ catalog 11 Feb 2004 04:16:54 - 1.7 @@ -21,7 +21,7 @@ -- Web Application Definitions -- PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN - web-app_2_2.dtd + web-app_2_3.dtd -- Note the deliberate avoidance of license issues -- PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN web-app_2_3.dtd @@ -72,4 +72,4 @@ catalog-demo/catalog-demo-v10.dtd -- end of entries for the catalog-demo sample application -- -PUBLIC -//OpenOffice.org//DTD OfficeDocument 1.0//EN open-office/dummy.dtd \ No newline at end of file +PUBLIC -//OpenOffice.org//DTD OfficeDocument 1.0//EN open-office/dummy.dtd
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event ProcessingPhase.java ProcessingPhaseEvent.java DeferredValueChangedEvent.java ActionEvent.java ValueChangedEvent.java FormHandler.java ActionListener.java ValueChangedListener.java AbstractFormHandler.java
antonio 2004/02/11 01:27:55
Modified:src/blocks/woody/java/org/apache/cocoon/woody/event/impl
JavaClassWidgetListenerBuilder.java
JavaScriptWidgetListenerBuilder.java
src/blocks/woody/java/org/apache/cocoon/woody/event
ProcessingPhase.java ProcessingPhaseEvent.java
DeferredValueChangedEvent.java ActionEvent.java
ValueChangedEvent.java FormHandler.java
ActionListener.java ValueChangedListener.java
AbstractFormHandler.java
Log:
Adding @version to files +
Add license to 1 file.
Revision ChangesPath
1.3 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaClassWidgetListenerBuilder.java
Index: JavaClassWidgetListenerBuilder.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaClassWidgetListenerBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JavaClassWidgetListenerBuilder.java 6 Feb 2004 14:43:14 -
1.2
+++ JavaClassWidgetListenerBuilder.java 11 Feb 2004 09:27:55 -
1.3
@@ -65,6 +65,7 @@
* /pre
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
+ * @version CVS $Id$
*/
public class JavaClassWidgetListenerBuilder implements WidgetListenerBuilder
{
1.5 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListenerBuilder.java
Index: JavaScriptWidgetListenerBuilder.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListenerBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaScriptWidgetListenerBuilder.java 6 Feb 2004 14:43:14 -
1.4
+++ JavaScriptWidgetListenerBuilder.java 11 Feb 2004 09:27:55 -
1.5
@@ -72,6 +72,7 @@
* variable.
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
+ * @version CVS $Id$
*/
public class JavaScriptWidgetListenerBuilder implements
WidgetListenerBuilder {
1.2 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java
Index: ProcessingPhase.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ProcessingPhase.java 24 Sep 2003 20:47:05 - 1.1
+++ ProcessingPhase.java 11 Feb 2004 09:27:55 - 1.2
@@ -60,6 +60,7 @@
* Type-safe enumeration of the various form processing phases.
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
+ * @version CVS $Id$
*/
public class ProcessingPhase extends ValuedEnum {
1.3 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhaseEvent.java
Index: ProcessingPhaseEvent.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhaseEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProcessingPhaseEvent.java 15 Nov 2003 04:21:30 - 1.2
+++ ProcessingPhaseEvent.java 11 Feb 2004 09:27:55 - 1.3
@@ -56,6 +56,7 @@
* Event raised when a form processing phase is finished.
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
+ * @version CVS $Id$
*/
public class ProcessingPhaseEvent extends WidgetEvent {
1.2 +1 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/DeferredValueChangedEvent.java
Index: DeferredValueChangedEvent.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/DeferredValueChangedEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DeferredValueChangedEvent.java24 Sep 2003 20:47:05 - 1.1
+++ DeferredValueChangedEvent.java11 Feb 2004 09:27:55 - 1.2
@@ -60,6 +60,7 @@
* value, thus avoiding unnecessary validation warnings when a user clicks
an action.
*
* @author a href=http://www.apache.org/~sylvain/;Sylvain Wallez/a
+ * @version CVS $Id$
*/
public class DeferredValueChangedEvent extends ValueChangedEvent {
1.5 +2 -0
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/expression ExpressionManager.java
antonio 2004/02/11 02:43:32
Modified:src/blocks/woody/java/org/apache/cocoon/woody/formmodel
BooleanFieldDefinition.java
AggregateFieldDefinition.java
MessagesDefinitionBuilder.java FieldDefinition.java
UnionDefinition.java CannotYetResolveWarning.java
ActionDefinitionBuilder.java
AbstractContainerDefinition.java Union.java
Messages.java Struct.java BooleanField.java
AbstractDatatypeWidgetDefinition.java
ContainerDefinition.java AbstractWidget.java
OutputDefinition.java FieldDefinitionBuilder.java
ExpressionContextImpl.java
OutputDefinitionBuilder.java
ButtonDefinitionBuilder.java
FormDefinitionBuilder.java
AbstractWidgetDefinition.java
ClassDefinitionBuilder.java
StructDefinitionBuilder.java MultiValueField.java
DuplicateIdException.java SelectableWidget.java
ClassDefinition.java MessagesDefinition.java
NewDefinition.java Output.java Repeater.java
MultiValueFieldDefinitionBuilder.java
StructDefinition.java AbstractContainerWidget.java
RepeaterDefinitionBuilder.java
AbstractDatatypeWidgetDefinitionBuilder.java
AbstractWidgetDefinitionBuilder.java
MultiValueFieldDefinition.java
ActionDefinition.java
ContainerDefinitionDelegate.java
BooleanFieldDefinitionBuilder.java
AggregateFieldDefinitionBuilder.java
NewDefinitionBuilder.java FormDefinition.java
ContainerWidget.java UnionDefinitionBuilder.java
Action.java ContainerDelegate.java
RepeaterDefinition.java DataWidget.java
src/blocks/woody/java/org/apache/cocoon/woody/samples
Form2Bean.java InitForm1Action.java
Form1Handler.java Contact.java
src/blocks/woody/java/org/apache/cocoon/woody/samples/bindings
LenientNotOKBean.java ValuesBean.java
LenientBaseBean.java LenientOKBean.java
src/blocks/woody/java/org/apache/cocoon/woody/util
SimpleServiceSelector.java StringMessage.java
src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript
Woody.java ScriptableWidget.java
src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript/v2
ScriptableWidget.java
src/blocks/woody/java/org/apache/cocoon/woody/transformation
EffectPipe.java
src/blocks/woody/java/org/apache/cocoon/woody/generation
WoodyGenerator.java
src/blocks/woody/java/org/apache/cocoon/woody/expression
ExpressionManager.java
Log:
Adding @version to files +
Add license to 2 files.
Revision ChangesPath
1.3 +2 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/BooleanFieldDefinition.java
Index: BooleanFieldDefinition.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/BooleanFieldDefinition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BooleanFieldDefinition.java 24 Sep 2003 20:47:06 - 1.2
+++ BooleanFieldDefinition.java 11 Feb 2004 10:43:30 - 1.3
@@ -56,6 +56,8 @@
/**
* The [EMAIL PROTECTED] WidgetDefinition} part of a BooleanField widget,
see [EMAIL PROTECTED] BooleanField} for more information.
+ *
+ * @version $Id$
*/
public class BooleanFieldDefinition extends AbstractWidgetDefinition {
private ValueChangedListener listener;
1.6 +2 -0
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java
Index: AggregateFieldDefinition.java
===
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/AggregateFieldDefinition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AggregateFieldDefinition.java 5 Feb 2004 21:37:47 - 1.5
+++ AggregateFieldDefinition.java 11 Feb 2004 10:43:30 - 1.6
@@ -61,6 +61,8 @@
/**
* The [EMAIL PROTECTED]
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
unico 2004/02/11 05:59:40
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
fix bug 26186: the assumption that a null value for the lastConsumer
indicates
an internal request is not true. See the two argument process method.
Revision ChangesPath
1.15 +6 -4
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractProcessingPipeline.java 6 Feb 2004 11:37:49 - 1.14
+++ AbstractProcessingPipeline.java 11 Feb 2004 13:59:39 - 1.15
@@ -151,6 +151,8 @@
/** Output Buffer Size */
protected int outputBufferSize;
+
+private boolean internal;
/**
* Composable Interface
@@ -492,11 +494,11 @@
*/
public boolean process(Environment environment)
throws ProcessingException {
-// If this is an internal request, lastConsumer was reset!
-if (null == this.lastConsumer) {
+// If this is an internal request, lastConsumer not the serializer!
+if (this.serializer != this.lastConsumer) {
this.lastConsumer = this.serializer;
}
-if (null != this.lastConsumer || this.reader != null) {
+if (this.serializer != this.lastConsumer || this.reader != null) {
this.preparePipeline(environment);
}
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
unico 2004/02/11 06:00:47 Modified:src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java Log: field not used Revision ChangesPath 1.16 +1 -3 cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java Index: AbstractProcessingPipeline.java === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- AbstractProcessingPipeline.java 11 Feb 2004 13:59:39 - 1.15 +++ AbstractProcessingPipeline.java 11 Feb 2004 14:00:47 - 1.16 @@ -151,8 +151,6 @@ /** Output Buffer Size */ protected int outputBufferSize; - -private boolean internal; /** * Composable Interface
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
unico 2004/02/11 06:37:28
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
reverting previous change, getting NPE :-( . sorry for mess up
Revision ChangesPath
1.17 +5 -4
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractProcessingPipeline.java 11 Feb 2004 14:00:47 - 1.16
+++ AbstractProcessingPipeline.java 11 Feb 2004 14:37:28 - 1.17
@@ -492,14 +492,15 @@
*/
public boolean process(Environment environment)
throws ProcessingException {
+
// If this is an internal request, lastConsumer not the serializer!
-if (this.serializer != this.lastConsumer) {
+if (null == this.lastConsumer) {
this.lastConsumer = this.serializer;
}
-if (this.serializer != this.lastConsumer || this.reader != null) {
+if (null != this.lastConsumer || this.reader != null) {
this.preparePipeline(environment);
}
-
+
// See if we need to set an Expires: header
if (this.expires != 0) {
Response res =
ObjectModelHelper.getResponse(environment.getObjectModel());
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
cziegeler2004/02/11 06:53:15
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
I think this should really fix the bug 26186 now. Is this correct?
Revision ChangesPath
1.18 +6 -5
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractProcessingPipeline.java 11 Feb 2004 14:37:28 - 1.17
+++ AbstractProcessingPipeline.java 11 Feb 2004 14:53:15 - 1.18
@@ -492,13 +492,14 @@
*/
public boolean process(Environment environment)
throws ProcessingException {
-
-// If this is an internal request, lastConsumer not the serializer!
+// If this is an internal request, lastConsumer was reset!
if (null == this.lastConsumer) {
this.lastConsumer = this.serializer;
-}
-if (null != this.lastConsumer || this.reader != null) {
+} else {
this.preparePipeline(environment);
+}
+if ( this.reader != null ) {
+this.preparePipeline(environment);
}
// See if we need to set an Expires: header
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/pipeline AbstractProcessingPipeline.java
cziegeler2004/02/11 07:59:02
Modified:src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
Log:
fix bug 26186
Revision ChangesPath
1.30 +5 -3
cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AbstractProcessingPipeline.java 6 Feb 2004 11:42:46 - 1.29
+++ AbstractProcessingPipeline.java 11 Feb 2004 15:59:02 - 1.30
@@ -430,9 +430,11 @@
// If this is an internal request, lastConsumer was reset!
if (null == this.lastConsumer) {
this.lastConsumer = this.serializer;
-}
-if (null != this.lastConsumer || this.reader != null) {
+} else {
this.preparePipeline(environment);
+}
+if ( this.reader != null ) {
+this.preparePipeline(environment);
}
// See if we need to set an Expires: header
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_JavaScriptInterpreter.java
coliver 2004/02/11 10:15:29
Modified:src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_JavaScriptInterpreter.java
Log:
Ensure complete recompilation of compilation unit containing inner classes
Revision ChangesPath
1.21 +25 -12
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Index: FOM_JavaScriptInterpreter.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FOM_JavaScriptInterpreter.java31 Jan 2004 16:50:56 - 1.20
+++ FOM_JavaScriptInterpreter.java11 Feb 2004 18:15:29 - 1.21
@@ -63,6 +63,8 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.HashSet;
+import java.util.Set;
import java.util.StringTokenizer;
import org.apache.avalon.framework.CascadingRuntimeException;
@@ -179,7 +181,13 @@
byte[] contents) {
javaSource.put(src.getURI(), src.getValidity());
javaClass.put(className, contents);
-sourceToClass.put(src.getURI(), className);
+String uri = src.getURI();
+Set set = (Set)sourceToClass.get(uri);
+if (set == null) {
+set = new HashSet();
+sourceToClass.put(uri, set);
+}
+set.add(className);
classToSource.put(className, src.getURI());
}
@@ -217,11 +225,16 @@
iter = invalid.iterator();
while (iter.hasNext()) {
String uri = (String)iter.next();
-String className = (String)sourceToClass.get(uri);
-sourceToClass.remove(className);
-javaClass.remove(className);
+Set set = (Set)sourceToClass.get(uri);
+Iterator ii = set.iterator();
+while (ii.hasNext()) {
+String className = (String)ii.next();
+sourceToClass.remove(className);
+javaClass.remove(className);
+classToSource.remove(className);
+}
+set.clear();
javaSource.remove(uri);
-classToSource.remove(className);
}
return invalid.size() == 0;
}
@@ -332,15 +345,15 @@
classLoader.addSourceListener(
new CompilingClassLoader.SourceListener() {
public void sourceCompiled(Source src) {
-// no action
+// no action
}
public void sourceCompilationError(Source src,
-String errMsg) {
-throw Context.reportRuntimeError(
-ToolErrorReporter.getMessage(
-msg.uncaughtJSException,
-errMsg));
+ String
errMsg) {
+
+if (src != null) {
+throw Context.reportRuntimeError(errMsg);
+}
}
});
updateSourcePath();
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
sylvain 2004/02/11 13:34:22
Modified:tools/src blocks-build.xsl
Log:
Fix link to other APIs in Javadoc generation
Revision ChangesPath
1.46 +7 -6 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- blocks-build.xsl 3 Feb 2004 11:12:05 - 1.45
+++ blocks-build.xsl 11 Feb 2004 21:34:22 - 1.46
@@ -163,12 +163,13 @@
useexternalfile=yes
additionalparam={string('${javadoc.additionalparam}')}
maxmemory=128m
-
-link offline=true href=http://avalon.apache.org/api;
packagelistloc=${resources.javadoc}/avalon/
-link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${resources.javadoc}/xerces/
-link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${resources.javadoc}/xalan/
-link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${resources.javadoc}/j2se/
-link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${resources.javadoc}/j2ee/
+
+link offline=true href=http://avalon.apache.org/framework/api;
packagelistloc=${{resources.javadoc}}/avalon-framework/
+link offline=true href=http://avalon.apache.org/excalibur/api;
packagelistloc=${{resources.javadoc}}/avalon-excalibur/
+link offline=true
href=http://xml.apache.org/xerces2-j/javadocs/api;
packagelistloc=${{resources.javadoc}}/xerces/
+link offline=true href=http://xml.apache.org/xalan-j/apidocs;
packagelistloc=${{resources.javadoc}}/xalan/
+link offline=true href=http://java.sun.com/j2se/1.4.1/docs/api;
packagelistloc=${{resources.javadoc}}/j2se/
+link offline=true
href=http://java.sun.com/j2ee/sdk_1.3/techdocs/api;
packagelistloc=${{resources.javadoc}}/j2ee/
tag name=avalon.component scope=types description=Avalon
component /
tag name=avalon.service scope=types
description=Implements service:; /
cvs commit: cocoon-2.1/src/resources/javadoc/avalon-excalibur - New directory
sylvain 2004/02/11 13:35:04 cocoon-2.1/src/resources/javadoc/avalon-excalibur - New directory
cvs commit: cocoon-2.1/src/resources/javadoc/avalon-framework package-list
sylvain 2004/02/11 13:35:50 Added: src/resources/javadoc/avalon-excalibur package-list src/resources/javadoc/avalon-framework package-list Removed: src/resources/javadoc/avalon package-list Log: Fix link to other APIs in Javadoc generation Revision ChangesPath 1.1 cocoon-2.1/src/resources/javadoc/avalon-excalibur/package-list Index: package-list === org.apache.avalon.excalibur.cli org.apache.avalon.excalibur.collections org.apache.avalon.excalibur.component org.apache.avalon.excalibur.component.servlet org.apache.avalon.excalibur.concurrent org.apache.avalon.excalibur.datasource org.apache.avalon.excalibur.datasource.cluster org.apache.avalon.excalibur.datasource.ids org.apache.avalon.excalibur.i18n org.apache.avalon.excalibur.io org.apache.avalon.excalibur.logger org.apache.avalon.excalibur.logger.decorator org.apache.avalon.excalibur.logger.factory org.apache.avalon.excalibur.logger.log4j org.apache.avalon.excalibur.logger.logkit org.apache.avalon.excalibur.logger.util org.apache.avalon.excalibur.monitor org.apache.avalon.excalibur.monitor.impl org.apache.avalon.excalibur.naming org.apache.avalon.excalibur.naming.memory org.apache.avalon.excalibur.naming.rmi org.apache.avalon.excalibur.naming.rmi.server org.apache.avalon.excalibur.pool org.apache.avalon.excalibur.testcase org.apache.avalon.excalibur.thread org.apache.avalon.excalibur.thread.impl org.apache.avalon.lifecycle org.apache.excalibur.configuration org.apache.excalibur.configuration.merged org.apache.excalibur.configuration.validation org.apache.excalibur.event org.apache.excalibur.event.command org.apache.excalibur.event.impl org.apache.excalibur.instrument org.apache.excalibur.instrument.client org.apache.excalibur.instrument.manager org.apache.excalibur.instrument.manager.altrmi org.apache.excalibur.instrument.manager.http org.apache.excalibur.instrument.manager.http.server org.apache.excalibur.instrument.manager.interfaces org.apache.excalibur.mpool org.apache.excalibur.source org.apache.excalibur.source.impl org.apache.excalibur.source.impl.validity org.apache.excalibur.store org.apache.excalibur.store.impl org.apache.excalibur.thread org.apache.excalibur.thread.impl org.apache.excalibur.util org.apache.excalibur.util.system org.apache.excalibur.xml org.apache.excalibur.xml.dom org.apache.excalibur.xml.impl org.apache.excalibur.xml.sax org.apache.excalibur.xml.xpath org.apache.excalibur.xml.xslt org.apache.excalibur.xmlizer 1.1 cocoon-2.1/src/resources/javadoc/avalon-framework/package-list Index: package-list === org.apache.avalon.framework org.apache.avalon.framework.activity org.apache.avalon.framework.component org.apache.avalon.framework.configuration org.apache.avalon.framework.container org.apache.avalon.framework.context org.apache.avalon.framework.logger org.apache.avalon.framework.parameters org.apache.avalon.framework.service org.apache.avalon.framework.thread
cvs commit: cocoon-2.1/src/blocks/slide/samples flow.js
unico 2004/02/11 15:41:32
Modified:src/blocks/slide/samples flow.js
Log:
avoid global and local variable name collision
Revision ChangesPath
1.10 +2 -2 cocoon-2.1/src/blocks/slide/samples/flow.js
Index: flow.js
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/samples/flow.js,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- flow.js 27 Jan 2004 16:01:06 - 1.9
+++ flow.js 11 Feb 2004 23:41:31 - 1.10
@@ -97,7 +97,7 @@
// -- property management
function protected_addproperty() {
- var baseUri = slide:// + principal + @ + namespace + /;
+ var baseUri = slide:// + principal + @ + nat.getName() + /;
var resourcePath = cocoon.request.getParameter(resourcePath);
var location = baseUri + resourcePath;
var source = null;
@@ -119,7 +119,7 @@
}
function protected_removeproperty() {
- var baseUri = slide:// + principal + @ + namespace + /;
+ var baseUri = slide:// + principal + @ + nat.getName() + /;
var resourcePath = cocoon.request.getParameter(resourcePath);
var location = baseUri + resourcePath;
var source = null;
