You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/06/26 18:27:00 UTC
svn commit: r417225 - in /cocoon/trunk/blocks:
cocoon-core-samples-additional/cocoon-core-samples-additional-impl/
cocoon-core-samples-main/cocoon-core-samples-main-impl/
cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components...
Author: cziegeler
Date: Mon Jun 26 09:26:59 2006
New Revision: 417225
URL: http://svn.apache.org/viewvc?rev=417225&view=rev
Log:
Correct poms - we should depend on the fop block and not directly on fop!
Modified:
cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-impl/pom.xml
cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-impl/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java
Modified: cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-impl/pom.xml?rev=417225&r1=417224&r2=417225&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-additional/cocoon-core-samples-additional-impl/pom.xml Mon Jun 26 09:26:59 2006
@@ -37,10 +37,5 @@
<artifactId>cocoon-core</artifactId>
<version>2.2.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.20.5</version>
- </dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-impl/pom.xml?rev=417225&r1=417224&r2=417225&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-impl/pom.xml Mon Jun 26 09:26:59 2006
@@ -38,9 +38,9 @@
<version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>fop</groupId>
- <artifactId>fop</artifactId>
- <version>0.20.5</version>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-fop-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java?rev=417225&r1=417224&r2=417225&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/components/modules/input/CollectionMetaModule.java Mon Jun 26 09:26:59 2006
@@ -48,20 +48,22 @@
*/
public class CollectionMetaModule extends AbstractMetaModule implements ThreadSafe {
- protected Configuration memberConf = null;
-
+ protected Configuration memberConf;
+ /**
+ * @see org.apache.cocoon.components.modules.input.AbstractInputModule#configure(org.apache.avalon.framework.configuration.Configuration)
+ */
public void configure(Configuration config) throws ConfigurationException {
-
this.memberConf = config.getChild("member");
this.inputConf = config.getChild("input-module");
this.defaultInput = this.inputConf.getAttribute("name",this.defaultInput);
}
-
+ /**
+ * @see org.apache.cocoon.components.modules.input.AbstractInputModule#getAttribute(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
public Object getAttribute( String name, Configuration modeConf, Map objectModel )
- throws ConfigurationException {
-
+ throws ConfigurationException {
if (!this.initialized) {
this.lazy_initialize();
}
@@ -117,10 +119,11 @@
return objects;
}
-
+ /**
+ * @see org.apache.cocoon.components.modules.input.AbstractInputModule#getAttributeNames(org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
public Iterator getAttributeNames( Configuration modeConf, Map objectModel )
- throws ConfigurationException {
-
+ throws ConfigurationException {
if (!this.initialized) {
this.lazy_initialize();
}
@@ -188,10 +191,11 @@
}
}
-
+ /**
+ * @see org.apache.cocoon.components.modules.input.AbstractInputModule#getAttributeValues(java.lang.String, org.apache.avalon.framework.configuration.Configuration, java.util.Map)
+ */
public Object[] getAttributeValues( String name, Configuration modeConf, Map objectModel )
- throws ConfigurationException {
-
+ throws ConfigurationException {
Iterator names = this.getAttributeNames( modeConf, objectModel );
ArrayList values = new ArrayList();
while (names.hasNext()) {
@@ -199,6 +203,5 @@
}
return values.toArray();
-
}
}