cvs commit: cocoon-2.1 CREDITS.txt
crossley2004/03/22 18:16:46 Modified:.CREDITS.txt Log: Fond memories of old Woody ;-) Revision ChangesPath 1.7 +4 -0 cocoon-2.1/CREDITS.txt Index: CREDITS.txt === RCS file: /home/cvs/cocoon-2.1/CREDITS.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CREDITS.txt 20 Mar 2004 02:40:54 - 1.6 +++ CREDITS.txt 23 Mar 2004 02:16:46 - 1.7 @@ -37,6 +37,10 @@ and Carlos Chávez are made posible by the time donated by AG Software, S. A. (http://www.agssa.net). +The initial code of the official Cocoon form handling block (CForms) +evolved from the Woody donation made by Outerthought +(http://outerthought.org). + Credits of included software
cvs commit: cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor package.html
crossley2004/03/22 18:20:10 Modified:tools/bin appendcp.bat src/java/org/apache/cocoon/components/crawler package.html src/java/org/apache/cocoon/components/modules package.html src/java/org/apache/cocoon/components/modules/input package.html src/java/org/apache/cocoon/components/modules/output package.html src/java/org/apache/cocoon/components/resolver package.html src/java/org/apache/cocoon/components/treeprocessor package.html src/java/org/apache/cocoon/components/treeprocessor/sitemap package.html src/java/org/apache/cocoon/i18n package.html src/java/org/apache/cocoon/util/log package.html src/blocks/forms/java/org/apache/cocoon/forms/datatype/convertor package.html src/blocks/scratchpad/java/org/apache/cocoon/components/store ehcache-defaults.xml src/blocks/woody/java/org/apache/cocoon/woody/datatype/convertor package.html Log: Add Apache License 2.0 Revision ChangesPath 1.2 +14 -0 cocoon-2.1/tools/bin/appendcp.bat Index: appendcp.bat === RCS file: /home/cvs/cocoon-2.1/tools/bin/appendcp.bat,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- appendcp.bat 4 Mar 2004 22:40:08 - 1.1 +++ appendcp.bat 23 Mar 2004 02:20:09 - 1.2 @@ -1,2 +1,16 @@ +rem Copyright 1999-2004 The Apache Software Foundation +rem +rem Licensed under the Apache License, Version 2.0 (the License); +rem you may not use this file except in compliance with the License. +rem You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an AS IS BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. + set CLASSPATH=%CLASSPATH%;%1 1.2 +15 -0 cocoon-2.1/src/java/org/apache/cocoon/components/crawler/package.html Index: package.html === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/crawler/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package.html 9 Mar 2003 00:08:48 - 1.1 +++ package.html 23 Mar 2004 02:20:09 - 1.2 @@ -1,3 +1,18 @@ +!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- html head titleCrawler - starts from a given URL and follows the links/title 1.2 +15 -0 cocoon-2.1/src/java/org/apache/cocoon/components/modules/package.html Index: package.html === RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/package.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- package.html 9 Mar 2003 00:09:01 - 1.1 +++ package.html 23 Mar 2004 02:20:09 - 1.2 @@ -1,3 +1,18 @@ +!-- + Copyright 1999-2004 The Apache Software Foundation + + Licensed under the Apache License, Version 2.0 (the License); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN html head 1.3 +15 -0 cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/package.html Index: package.html
cvs commit: cocoon-2.1/lib jars.xml
antonio 2004/03/22 23:33:15 Modified:.status.xml lib jars.xml Added: lib/optional castor-0.9.5.3-xml.jar Removed: lib/optional castor-0.9.5-xml.jar Log: Update castor-xml to 0.9.5.3 (include bug fix for:http://www.mail-archive.com/castor-dev%40exolab.org/msg15353.html) Revision ChangesPath 1.287 +2 -2 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.1/status.xml,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- status.xml20 Mar 2004 01:50:58 - 1.286 +++ status.xml23 Mar 2004 07:33:15 - 1.287 @@ -213,7 +213,7 @@ release version=@version@ date=@date@ action dev=AG type=update - Updated jdtcore to 2.1.3 + Updated jdtcore to 2.1.3, update castor-xml to 0.9.5.3 /action action dev=CZ type=fix fixes-bug=27764 due-to=Corin Moss due-to-email=[EMAIL PROTECTED] DefaultIncludeCacheManager did not release xml-serializer under some circumstances. 1.1 cocoon-2.1/lib/optional/castor-0.9.5.3-xml.jar Binary file 1.192 +3 -3 cocoon-2.1/lib/jars.xml Index: jars.xml === RCS file: /home/cvs//cocoon-2.1/lib/jars.xml,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- jars.xml 22 Mar 2004 17:05:29 - 1.191 +++ jars.xml 23 Mar 2004 07:33:15 - 1.192 @@ -722,8 +722,8 @@ titleCastor/title description/description used-byCastorTransformer and precept/used-by -liboptional/castor-0.9.5-xml.jar/lib -homepagehttp://castor.exolab.org/homepage +liboptional/castor-0.9.5.3-xml.jar/lib +homepagehttp://castor.exolab.org//homepage /file !-- Currently only used by the build
cvs commit: cocoon-2.2/lib/core rhino1.5r4-continuations-20040228.jar rhino1.5r4-continuations-20030906.jar
antonio 2004/03/22 23:59:30 Modified:lib jars.xml .gump.xml status.xml Added: lib/optional jdtcore-2.1.3.jar lib/core rhino1.5r4-continuations-20040228.jar Removed: lib/optional jdtcore-2.1.2.jar lib/core rhino1.5r4-continuations-20030906.jar Log: Updated jdtcore to 2.1.3, rhino1.5r4-continuations to 20040228 Revision ChangesPath 1.132 +3 -3 cocoon-2.2/lib/jars.xml Index: jars.xml === RCS file: /home/cvs//cocoon-2.2/lib/jars.xml,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- jars.xml 5 Mar 2004 08:04:28 - 1.131 +++ jars.xml 23 Mar 2004 07:59:28 - 1.132 @@ -430,7 +430,7 @@ titleEclipse Java Development Tools Core/title descriptionEclipse Java Compiler/description used-byXSP/used-by -liboptional/jdtcore-2.1.2.jar/lib +liboptional/jdtcore-2.1.3.jar/lib homepagehttp://www.eclipse.org/jdt/homepage /file @@ -438,7 +438,7 @@ titleContinuations-based JavaScript engine/title descriptionRhino is an implementation of JavaScript in Java./description used-byControl flow/used-by -libcore/rhino1.5r4-continuations-20030906.jar/lib +libcore/rhino1.5r4-continuations-20040228.jar/lib homepagehttp://cvs.cocoondev.org/cgi-bin/viewcvs.cgi/?cvsroot=rhino/homepage /file 1.1 cocoon-2.2/lib/optional/jdtcore-2.1.3.jar Binary file 1.95 +2 -2 cocoon-2.2/gump.xml Index: gump.xml === RCS file: /home/cvs//cocoon-2.2/gump.xml,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- gump.xml 10 Mar 2004 08:43:23 - 1.94 +++ gump.xml 23 Mar 2004 07:59:29 - 1.95 @@ -186,7 +186,7 @@ Java Development Tools from the Eclipse IDE Project /description home nested=lib/optional/ -jar name=jdtcore-2.1.2.jar/ +jar name=jdtcore-2.1.3.jar/ /project project name=spark 1.190 +4 -1 cocoon-2.2/status.xml Index: status.xml === RCS file: /home/cvs//cocoon-2.2/status.xml,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- status.xml10 Mar 2004 08:43:23 - 1.189 +++ status.xml23 Mar 2004 07:59:29 - 1.190 @@ -204,6 +204,9 @@ changes release version=@version@ date=@date@ +action dev=AG type=update + Updated jdtcore to 2.1.3, rhino1.5r4-continuations to 20040228 + /action action dev=JH type=fix fixes-bug=13904 due-to=Bernhard Huber due-to-email=[EMAIL PROTECTED] Ported fix from 2.1 to FilterTransformer. /action 1.1 cocoon-2.2/lib/core/rhino1.5r4-continuations-20040228.jar Binary file
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl TraversableCachingSource.java
unico 2004/03/23 04:46:39
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
TraversableCachingSource.java
Log:
set lastmodified to current time if not available from wrapped source
Revision ChangesPath
1.2 +9 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/TraversableCachingSource.java
Index: TraversableCachingSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/TraversableCachingSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TraversableCachingSource.java 22 Mar 2004 17:38:25 - 1.1
+++ TraversableCachingSource.java 23 Mar 2004 12:46:38 - 1.2
@@ -164,10 +164,17 @@
protected SourceMeta readMeta() throws IOException {
final TraversableSourceMeta meta = new TraversableSourceMeta();
+final long lastModified = getTraversableSource().getLastModified();
+if (lastModified 0) {
+meta.setLastModified(lastModified);
+}
+else {
+meta.setLastModified(System.currentTimeMillis());
+}
+meta.setMimeType(getTraversableSource().getMimeType());
+
meta.setName(getTraversableSource().getName());
meta.setIsCollection(getTraversableSource().isCollection());
-meta.setLastModified(getTraversableSource().getLastModified());
-meta.setMimeType(getTraversableSource().getMimeType());
if (meta.isCollection()) {
final Collection children = getTraversableSource().getChildren();
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl CachingSourceFactory.java
unico 2004/03/23 04:47:23
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
CachingSourceFactory.java
Log:
use alternative constructor
Revision ChangesPath
1.6 +3 -3
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Index: CachingSourceFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachingSourceFactory.java 22 Mar 2004 17:38:25 - 1.5
+++ CachingSourceFactory.java 23 Mar 2004 12:47:22 - 1.6
@@ -293,7 +293,7 @@
if (wrappedSource instanceof TraversableSource) {
source = new TraversableCachingSource(scheme,
location,
- uri,
+ (TraversableSource)
wrappedSource,
cacheName,
expires,
parameters,
@@ -302,7 +302,7 @@
else {
source = new CachingSource(scheme,
location,
- uri,
+ wrappedSource,
cacheName,
expires,
parameters,
cvs commit: cocoon-2.1 gump.xml
joerg 2004/03/23 05:22:16 Modified:.gump.xml Log: fixed Avalon framework dependency, thanks to Stefan Bodewig Revision ChangesPath 1.128 +3 -2 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gump.xml 20 Mar 2004 01:50:59 - 1.127 +++ gump.xml 23 Mar 2004 13:22:16 - 1.128 @@ -38,7 +38,7 @@ ant target=gump-core property name=version value=@@DATE@@/ depend property=logkit.jar project=dist-avalon-logkit/ - depend property=avalonapi.jar project=avalon/ + depend property=avalonapi.jar project=avalon-framework id=api/ /ant depend project=ant inherit=runtime/ @@ -47,6 +47,7 @@ depend project=xml-xalan2/ depend project=xml-commons-resolver/ +depend project=avalon-framework ids=impl/ depend project=excalibur-compatibility/ depend project=excalibur-instrument/ depend project=excalibur-instrument-manager/
cvs commit: cocoon-2.2/src/java/org/apache/cocoon Cocoon.java
cziegeler2004/03/23 07:19:22
Modified:src/java/org/apache/cocoon Cocoon.java
Log:
SourceResolver is not used here
Revision ChangesPath
1.41 +3 -8 cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Cocoon.java 10 Mar 2004 17:58:04 - 1.40
+++ Cocoon.java 23 Mar 2004 15:19:22 - 1.41
@@ -38,9 +38,9 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.impl.URLSource;
/**
@@ -89,9 +89,6 @@
private static final String lineSeparator =
System.getProperty(line.separator);
-/** The source resolver */
-protected SourceResolver sourceResolver;
-
/** The environment helper */
protected EnvironmentHelper environmentHelper;
@@ -106,12 +103,10 @@
*
* @param manager the parent service manager.
*
- * @avalon.dependency type=SourceResolver
*/
public void service(ServiceManager manager)
throws ServiceException {
this.serviceManager = manager;
-this.sourceResolver = (SourceResolver)
this.serviceManager.lookup(SourceResolver.ROLE);
try {
this.environmentHelper = new EnvironmentHelper(
(String)
this.context.get(Constants.CONTEXT_ROOT_URL));
@@ -434,7 +429,7 @@
/* (non-Javadoc)
* @see org.apache.cocoon.Processor#getEnvironmentHelper()
*/
-public org.apache.cocoon.environment.SourceResolver getSourceResolver() {
+public SourceResolver getSourceResolver() {
return this.environmentHelper;
}
cvs commit: cocoon-2.1/src/blocks/scratchpad/conf delay-refresher.xconf
unico 2004/03/23 08:28:54
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
CachingSourceFactory.java CachingSource.java
TraversableCachingSource.java UpdateTarget.java
DelayRefresher.java
src/blocks/scratchpad/conf delay-refresher.xconf
Log:
factor common code used by updater, fix asynchronic update for traversables
Revision ChangesPath
1.7 +6 -12
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java
Index: CachingSourceFactory.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CachingSourceFactory.java 23 Mar 2004 12:47:22 - 1.6
+++ CachingSourceFactory.java 23 Mar 2004 16:28:54 - 1.7
@@ -271,7 +271,7 @@
while (names.hasNext()) {
String name = (String) names.next();
if (name.startsWith(cocoon:)) {
-
params.setParameter(name.substring(cocoon:.length()),sp.getParameter(name));
+params.setParameter(name.substring(cocoon:.length()),
sp.getParameter(name));
sp.removeParameter(name);
}
}
@@ -281,12 +281,12 @@
}
}
-final String cacheName = params.getParameter(cache-name, null);
int expires = params.getParameterAsInteger(cache-expires, -1);
if (expires == -1) {
expires = this.defaultExpires;
params.setParameter(cache-expires,
String.valueOf(this.defaultExpires));
}
+params.setParameter(cache-role, this.cacheRole);
final Source wrappedSource = this.resolver.resolveURI(uri);
CachingSource source;
@@ -294,29 +294,23 @@
source = new TraversableCachingSource(scheme,
location,
(TraversableSource)
wrappedSource,
- cacheName,
+ params,
expires,
- parameters,
this.async);
}
else {
source = new CachingSource(scheme,
location,
wrappedSource,
- cacheName,
+ params,
expires,
- parameters,
this.async);
}
-if (this.async) {
-// schedule it with the refresher
-this.refresher.refresh(source.getCacheKey(), uri,
this.cacheRole, params);
-}
-
// set the required components directly for speed
source.cache = this.cache;
source.resolver = this.resolver;
+source.refresher = this.refresher;
ContainerUtil.enableLogging(source, this.getLogger());
try {
1.8 +115 -81
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSource.java
Index: CachingSource.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/CachingSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CachingSource.java22 Mar 2004 17:38:25 - 1.7
+++ CachingSource.java23 Mar 2004 16:28:54 - 1.8
@@ -20,11 +20,12 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.util.Map;
+import java.util.Collection;
+import java.util.Iterator;
import org.apache.avalon.framework.activity.Initializable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
@@ -41,6 +42,7 @@
import org.apache.excalibur.source.SourceNotFoundException;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.source.SourceValidity;
+import
cvs commit: cocoon-2.1/src/blocks/petstore/samples/flow petstore.js
coliver 2004/03/23 08:36:04
Modified:src/blocks/petstore/samples/flow petstore.js
Log:
fix viewProduct() to use page-local row count after sendPageAndWait()
Revision ChangesPath
1.9 +2 -1 cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js
Index: petstore.js
===
RCS file: /home/cvs/cocoon-2.1/src/blocks/petstore/samples/flow/petstore.js,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- petstore.js 15 Mar 2004 09:15:25 - 1.8
+++ petstore.js 23 Mar 2004 16:36:04 - 1.9
@@ -220,6 +220,7 @@
local.skipResults,
maxResults);
local.lastPage = !itemList.isLimitedByMaxRows;
+local.rowCount = itemList.rowCount;
var contextData = {
accountForm: accountForm,
fmt: formatter,
@@ -242,7 +243,7 @@
}
} else if (page == next) {
if (!local.lastPage) {
-local.skipResults += itemList.rowCount;
+local.skipResults += local.rowCount;
}
}
}
cvs commit: cocoon-2.1/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components PBFactoryImpl.java
stephan 2004/03/23 11:21:33
Modified:src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components
PBFactoryImpl.java
Log:
Correct indention.
Revision ChangesPath
1.3 +24 -31
cocoon-2.1/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactoryImpl.java
Index: PBFactoryImpl.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/ojb/java/org/apache/cocoon/ojb/broker/components/PBFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PBFactoryImpl.java5 Mar 2004 13:02:01 - 1.2
+++ PBFactoryImpl.java23 Mar 2004 19:21:33 - 1.3
@@ -33,47 +33,40 @@
* @author a href=mailto:[EMAIL PROTECTED]Antonio Gallardo/a
* @version CVS $Id$
*/
-public class PBFactoryImpl extends AbstractOjbImpl implements PBFactory,
Configurable, Initializable,
-Disposable, ThreadSafe
-{
+public class PBFactoryImpl extends AbstractOjbImpl implements PBFactory,
Configurable, Initializable, Disposable, ThreadSafe {
+
/* (non-Javadoc)
* @see
org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
*/
-public void configure(Configuration myconf) throws ConfigurationException
-{
- if (this.getLogger().isDebugEnabled())
- this.getLogger().debug(OJB-JDO: configuration);
+public void configure(Configuration myconf) throws
ConfigurationException {
+if (this.getLogger().isDebugEnabled())
+this.getLogger().debug(OJB-JDO: configuration);
}
/* (non-Javadoc)
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
-public void dispose()
-{
+public void dispose() {
super.dispose();
- if (this.getLogger().isDebugEnabled())
- this.getLogger().debug(OJB-PB: Disposed OK!);
+if (this.getLogger().isDebugEnabled())
+this.getLogger().debug(OJB-PB: Disposed OK!);
}
- /* (non-Javadoc)
- * @see org.apache.avalon.framework.activity.Initializable#initialize()
- */
- public void initialize() throws Exception
- {
-super.initialize();
- try
- {
- if (this.getLogger().isDebugEnabled()) {
- this.getLogger().debug(OJB-PB: Started OK!);
-}
- }
- catch (Throwable t)
- {
- if (this.getLogger().isFatalErrorEnabled()) {
- this.getLogger().fatalError(OJB-PB: Started
failed: Cannot create a Persistence Broker Factory.,t);
- }
- }
- }
+/* (non-Javadoc)
+ * @see org.apache.avalon.framework.activity.Initializable#initialize()
+ */
+public void initialize() throws Exception {
+ super.initialize();
+ try {
+ if (this.getLogger().isDebugEnabled()) {
+ this.getLogger().debug(OJB-PB: Started OK!);
+ }
+ } catch (Throwable t) {
+ if (this.getLogger().isFatalErrorEnabled()) {
+ this.getLogger().fatalError(OJB-PB: Started failed:
Cannot create a Persistence Broker Factory.,t);
+ }
+ }
+}
/* (non-Javadoc)
* @see
org.apache.cocoon.ojb.broker.components.PBFactory#defaultPersistenceBroker()
cvs commit: cocoon-2.1/tools/src blocks-build.xsl
stephan 2004/03/23 11:23:07
Modified:tools/src blocks-build.xsl
Log:
Allow to share codebase to other blocks.
Revision ChangesPath
1.59 +2 -0 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- blocks-build.xsl 20 Mar 2004 17:29:49 - 1.58
+++ blocks-build.xsl 23 Mar 2004 19:23:06 - 1.59
@@ -527,6 +527,8 @@
include name=lib/*.jar/
/fileset
pathelement location=${{build.blocks}}/{$block-name}/mocks/
+pathelement location=${{build.blocks}}/{$block-name}/dest/
+pathelement location=${{build.blocks}}/{$block-name}/samples/
xsl:for-each select=$cocoon-block-dependencies
path
refid={substring-after(@project,'cocoon-block-')}.classpath/
/xsl:for-each
cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/xsp logicsheet-forms.xml
tcurdt 2004/03/23 11:29:02 Modified:.blocks.properties gump.xml status.xml lib jars.xml src/documentation/xdocs/developing/webapps book.xml src/documentation/xdocs/faq index.xml src/documentation/xdocs/howto README.txt book.xml index.xml src/documentation/xdocs index.xml src/documentation/xdocs/plan changes-doc.xml src/documentation/xdocs/userdocs/concepts book.xml validation.xml src/documentation/xdocs/userdocs/xsp logicsheet-forms.xml Log: removed xmlform and jxforms documentation and references Revision ChangesPath 1.67 +0 -2 cocoon-2.1/blocks.properties Index: blocks.properties === RCS file: /home/cvs/cocoon-2.1/blocks.properties,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- blocks.properties 11 Mar 2004 14:12:08 - 1.66 +++ blocks.properties 23 Mar 2004 19:29:01 - 1.67 @@ -60,7 +60,6 @@ #exclude.block.itext=true #exclude.block.jfor=true #exclude.block.jsp=true -#exclude.block.jxforms=true #exclude.block.linkrewriter=true #exclude.block.lucene=true #exclude.block.naming=true @@ -140,4 +139,3 @@ # in favour of other blocks and therefore are excluded by default from the build exclude.block.woody=true -exclude.block.xmlform=true 1.129 +1 -21 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- gump.xml 23 Mar 2004 13:22:16 - 1.128 +++ gump.xml 23 Mar 2004 19:29:01 - 1.129 @@ -850,26 +850,6 @@ nag from=Gump to=dev@cocoon.apache.org/ /project - project name=cocoon-block-jxforms status=stable -packageorg.apache.cocoon/package - -ant target=gump-block - property name=block-name value=jxforms/ - property name=version value=@@DATE@@/ -/ant - -depend project=cocoon inherit=all/ - -work nested=build/cocoon-@@DATE@@/blocks/jxforms/dest/ -work nested=build/cocoon-@@DATE@@/blocks/jxforms/test/ -work nested=tools/anttasks/ -home nested=build/cocoon-@@DATE@@/ - -jar name=blocks/jxforms-block.jar/ - -nag from=Gump to=dev@cocoon.apache.org/ - /project - project name=cocoon-block-petstore status=unstable packageorg.apache.cocoon/package 1.288 +8 -3 cocoon-2.1/status.xml Index: status.xml === RCS file: /home/cvs/cocoon-2.1/status.xml,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- status.xml23 Mar 2004 07:33:15 - 1.287 +++ status.xml23 Mar 2004 19:29:01 - 1.288 @@ -1,4 +1,4 @@ -?xml version=1.0? +?xml version=1.0? !-- Copyright 1999-2004 The Apache Software Foundation @@ -212,7 +212,12 @@ changes release version=@version@ date=@date@ -action dev=AG type=update + action dev=TC type=remove + Removed xmlform and jxforms blocks as confirmed by a users poll. + /action + action dev=TC type=remove + Removed precept block. Was dead code. + action dev=AG type=update Updated jdtcore to 2.1.3, update castor-xml to 0.9.5.3 /action action dev=CZ type=fix fixes-bug=27764 due-to=Corin Moss due-to-email=[EMAIL PROTECTED] 1.193 +2 -2 cocoon-2.1/lib/jars.xml Index: jars.xml === RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- jars.xml 23 Mar 2004 07:33:15 - 1.192 +++ jars.xml 23 Mar 2004 19:29:02 - 1.193 @@ -651,7 +651,7 @@ file titleJakarta Commons JXPath/title descriptionXPath interpreter. Work with JavaBeans and DOM nodes/description -used-byFlow, JXPath logicsheet, and XMLForm/used-by +used-byFlow, JXPath logicsheet/used-by libcore/commons-jxpath-20030909.jar/lib homepagehttp://jakarta.apache.org/commons/jxpath//homepage /file 1.7 +0 -1 cocoon-2.1/src/documentation/xdocs/developing/webapps/book.xml Index: book.xml === RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/developing/webapps/book.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- book.xml 6 Mar 2004 02:26:11 - 1.6 +++ book.xml 23 Mar 2004 19:29:02 - 1.7 @@ -30,7 +30,6 @@ menu-item label=Session
cvs commit: cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler ProfilingCachingProcessingPipeline.java ProfilingNonCachingProcessingPipeline.java
stephan 2004/03/23 11:48:43
Modified:src/blocks/profiler/java/org/apache/cocoon/components/profiler
ProfilingCachingProcessingPipeline.java
ProfilingNonCachingProcessingPipeline.java
Log:
Add support for internal pipelines, see
http://issues.apache.org/bugzilla/show_bug.cgi?id=27875
Revision ChangesPath
1.7 +49 -1
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java
Index: ProfilingCachingProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProfilingCachingProcessingPipeline.java 5 Mar 2004 13:02:20 -
1.6
+++ ProfilingCachingProcessingPipeline.java 23 Mar 2004 19:48:43 -
1.7
@@ -278,6 +278,54 @@
}
/**
+ * Process the SAX event pipeline
+ */
+protected boolean processXMLPipeline(Environment environment) throws
ProcessingException {
+this.index = 0;
+if (this.data!=null) {
+// Capture environment info
+this.data.setEnvironmentInfo(new EnvironmentInfo(environment));
+
+// Execute pipeline
+long time = System.currentTimeMillis();
+boolean result = super.processXMLPipeline(environment);
+
+this.data.setTotalTime(System.currentTimeMillis()-time);
+
+// Report
+profiler.addResult(environment.getURI(), this.data);
+return result;
+} else {
+getLogger().warn(Profiler Data havn't any components to
measure);
+return super.processXMLPipeline(environment);
+}
+}
+
+/**
+ * Process the pipeline using a reader.
+ */
+protected boolean processReader(Environment environment) throws
ProcessingException {
+this.index = 0;
+ if (this.data!=null) {
+ // Capture environment info
+ this.data.setEnvironmentInfo(new EnvironmentInfo(environment));
+
+ // Execute pipeline
+ long time = System.currentTimeMillis();
+ boolean result = super.processReader(environment);
+
+ this.data.setTotalTime(System.currentTimeMillis()-time);
+
+ // Report
+ profiler.addResult(environment.getURI(), this.data);
+ return result;
+ } else {
+ getLogger().warn(Profiler Data havn't any components to
measure);
+ return super.processReader(environment);
+ }
+}
+
+/**
* Connect the next component
*
* @param environment
1.7 +50 -1
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java
Index: ProfilingNonCachingProcessingPipeline.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProfilingNonCachingProcessingPipeline.java5 Mar 2004 13:02:20
- 1.6
+++ ProfilingNonCachingProcessingPipeline.java23 Mar 2004 19:48:43
- 1.7
@@ -272,6 +272,55 @@
}
/**
+ * Process the SAX event pipeline
+ */
+protected boolean processXMLPipeline(Environment environment) throws
ProcessingException {
+this.index = 0;
+if (this.data!=null) {
+// Capture environment info
+this.data.setEnvironmentInfo(new EnvironmentInfo(environment));
+
+// Execute pipeline
+long time = System.currentTimeMillis();
+boolean result = super.processXMLPipeline(environment);
+
+this.data.setTotalTime(System.currentTimeMillis()-time);
+
+// Report
+profiler.addResult(environment.getURI(), this.data);
+return result;
+} else {
+getLogger().warn(Profiler Data havn't any components to
measure);
+return super.processXMLPipeline(environment);
+}
+}
+
+/**
+ * Process the pipeline using a reader.
+ */
+protected boolean processReader(Environment environment) throws
ProcessingException {
+this.index = 0;
+ if (this.data!=null) {
+ // Capture environment info
+ this.data.setEnvironmentInfo(new EnvironmentInfo(environment));
+
+ // Execute pipeline
+
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom CompilingClassLoader.java
stephan 2004/03/23 12:03:15
Modified:src/java/org/apache/cocoon/components/flow/javascript/fom
CompilingClassLoader.java
Log:
fixed indention.
Revision ChangesPath
1.9 +122 -124
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java
Index: CompilingClassLoader.java
===
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CompilingClassLoader.java 5 Mar 2004 13:02:46 - 1.8
+++ CompilingClassLoader.java 23 Mar 2004 20:03:15 - 1.9
@@ -192,6 +192,7 @@
baos.flush();
final Reader reader =
new BufferedReader(new InputStreamReader(new
ByteArrayInputStream(baos.toByteArray(;
+
return new JavaSourceReader() {
public Reader getReader() {
return reader;
@@ -220,141 +221,138 @@
class ClassReaderFactory
implements JavaClassReaderFactory {
-public JavaClassReader
-getClassReader(final String className)
- throws IOException {
- final byte[] bytes =
classRepository.getCompiledClass(className);
- if (bytes != null) {
- return new JavaClassReader() {
- public String getClassName() {
- return className;
- }
-
- public InputStream getInputStream() {
-
- return new ByteArrayInputStream(bytes);
- }
- };
- }
-String classFile = className.replace('.', '/') + .class;
-final InputStream is = getResourceAsStream(classFile);
-if (is == null) {
-return null;
-}
+public JavaClassReader getClassReader(final String className)
+throws IOException {
+final byte[] bytes = classRepository.getCompiledClass(className);
+if (bytes != null) {
return new JavaClassReader() {
-public String getClassName() {
-return className;
-}
+public String getClassName() {
+return className;
+}
+
+public InputStream getInputStream() {
+return new ByteArrayInputStream(bytes);
+}
+};
+}
+String classFile = className.replace('.', '/') + .class;
+final InputStream is = getResourceAsStream(classFile);
+if (is == null) {
+return null;
+}
+return new JavaClassReader() {
+public String getClassName() {
+return className;
+}
-public InputStream getInputStream() {
-return is;
-}
-};
- }
- }
+public InputStream getInputStream() {
+return is;
+}
+};
+}
+}
- class ClassWriterFactory
- implements JavaClassWriterFactory {
+class ClassWriterFactory
+implements JavaClassWriterFactory {
- public JavaClassWriter
- getClassWriter(final String className) {
- return new JavaClassWriter() {
- public String
- getClassName() {
- return className;
- }
- public void writeClass(InputStream contents)
- throws IOException {
- byte[] buf = new byte[2048];
- ByteArrayOutputStream s =
- new ByteArrayOutputStream();
- int count;
- while ((count =
- contents.read(buf, 0,
- buf.length)) 0) {
- s.write(buf, 0, count);
- }
- s.flush();
- System.out.println(Compiled: + className);
-Source src = getSource(className);
-
cvs commit: cocoon-2.1 gump.xml
tcurdt 2004/03/23 12:03:20 Modified:.gump.xml Log: removed xmlform Revision ChangesPath 1.130 +1 -21 cocoon-2.1/gump.xml Index: gump.xml === RCS file: /home/cvs/cocoon-2.1/gump.xml,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- gump.xml 23 Mar 2004 19:29:01 - 1.129 +++ gump.xml 23 Mar 2004 20:03:20 - 1.130 @@ -830,26 +830,6 @@ nag from=Gump to=dev@cocoon.apache.org/ /project - project name=cocoon-block-xmlform status=deprecated -packageorg.apache.cocoon/package - -ant target=gump-block - property name=block-name value=xmlform/ - property name=version value=@@DATE@@/ -/ant - -depend project=cocoon inherit=all/ - -work nested=build/cocoon-@@DATE@@/blocks/xmlform/dest/ -work nested=build/cocoon-@@DATE@@/blocks/xmlform/test/ -work nested=tools/anttasks/ -home nested=build/cocoon-@@DATE@@/ - -jar name=blocks/xmlform-block.jar/ - -nag from=Gump to=dev@cocoon.apache.org/ - /project - project name=cocoon-block-petstore status=unstable packageorg.apache.cocoon/package
cvs commit: cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl DelayRefresher.java
joerg 2004/03/23 12:06:41
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
DelayRefresher.java
Log:
unnecessary type cast removed
Revision ChangesPath
1.3 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
Index: DelayRefresher.java
===
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DelayRefresher.java 23 Mar 2004 16:28:54 - 1.2
+++ DelayRefresher.java 23 Mar 2004 20:06:41 - 1.3
@@ -231,7 +231,7 @@
try {
this.scheduler.addPeriodicJob(this.getClass().getName(),
this,
- (long) writeInterval,
+ writeInterval,
true,
null,
null);
