cziegeler 02/04/17 02:20:21
Modified: src/scratchpad/src/org/apache/cocoon/components/modules
modules.xconf
src/scratchpad/src/org/apache/cocoon/sunshine SunShine.java
Log:
Components are only added once
Revision Changes Path
1.2 +1 -1
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/modules.xconf
Index: modules.xconf
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/components/modules/modules.xconf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- modules.xconf 15 Mar 2002 15:15:08 -0000 1.1
+++ modules.xconf 17 Apr 2002 09:20:21 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<xconf xpath="/cocoon">
+<xconf xpath="/cocoon" unless="input-modules">
<!-- =============== Sitemap In/Out/Database Modules ==================== -->
<input-modules>
1.6 +3 -3
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/SunShine.java
Index: SunShine.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/sunshine/SunShine.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SunShine.java 2 Apr 2002 14:23:44 -0000 1.5
+++ SunShine.java 17 Apr 2002 09:20:21 -0000 1.6
@@ -93,7 +93,7 @@
import org.apache.cocoon.sunshine.context.SessionContextProvider;
import org.apache.cocoon.sunshine.context.SimpleSessionContext;
import org.apache.cocoon.sunshine.context.StandardSessionContextProvider;
-import org.apache.cocoon.sunshine.xml.XMLUtil;
+import org.apache.cocoon.xml.dom.DOMUtil;
/**
* This is the basic sunShine component.
@@ -110,7 +110,7 @@
* allowed but if one thread wants to write, no other can read or write.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: SunShine.java,v 1.5 2002/04/02 14:23:44 cziegeler Exp $
+ * @version CVS $Id: SunShine.java,v 1.6 2002/04/17 09:20:21 cziegeler Exp $
*/
public final class SunShine
extends AbstractLoggable
@@ -787,7 +787,7 @@
// now we have found a node with the same name
// next: the attributes must match also
- found = XMLUtil.compareAttributes((Element)currentProfile,
(Element)currentDelta);
+ found = DOMUtil.compareAttributes((Element)currentProfile,
(Element)currentDelta);
}
if (found == false) m++;
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
