svn commit: r1906870 - in /cocoon/trunk: ./ blocks/ blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/ blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/ bl...
[email protected] Sat, 21 Jan 2023 14:22:28 -0000
| Newsgroups | gmane.text.xml.cocoon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: javier
Date: Sat Jan 21 14:22:28 2023
New Revision: 1906870
URL: http://svn.apache.org/viewvc?rev=1906870&view=rev
Log:
Merge branch cocoon-2.2.1 for release process.
Modified:
cocoon/trunk/ (props changed)
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceWrapper.java
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java
cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
cocoon/trunk/blocks/pom.xml
cocoon/trunk/commons/KEYS
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/parent/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/tools/pom.xml
Propchange: cocoon/trunk/
------------------------------------------------------------------------------
Merged /cocoon/branches/cocoon-2.2.1:r1906072-1906426
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceWrapper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceWrapper.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceWrapper.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-bridge/src/main/java/org/apache/cocoon/databases/bridge/spring/avalon/SpringToAvalonDataSourceWrapper.java Sat Jan 21 14:22:28 2023
@@ -21,6 +21,8 @@ package org.apache.cocoon.databases.brid
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -34,7 +36,7 @@ import org.apache.avalon.framework.confi
*
*/
public class SpringToAvalonDataSourceWrapper implements DataSource, DataSourceComponent {
-
+
private DataSource wrappedBean;
/**
@@ -81,6 +83,13 @@ public class SpringToAvalonDataSourceWra
}
/**
+ * Required by JDK1.7.
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
+ /**
* @return
* @throws SQLException
* @see javax.sql.CommonDataSource#getLogWriter()
@@ -106,7 +115,7 @@ public class SpringToAvalonDataSourceWra
public void setLogWriter(PrintWriter out) throws SQLException {
wrappedBean.setLogWriter(out);
}
-
+
/**
* @param iface
* @return
@@ -114,8 +123,7 @@ public class SpringToAvalonDataSourceWra
* @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
*/
public boolean isWrapperFor(Class iface) throws SQLException {
- throw new UnsupportedOperationException("This operation is not supported because we need to stay compatible " +
- "with Java 1.4 where isWrapperFor() is not defined");
+ return wrappedBean.isWrapperFor(iface);
}
/**
@@ -125,9 +133,7 @@ public class SpringToAvalonDataSourceWra
* @see java.sql.Wrapper#unwrap(java.lang.Class)
*/
public Object unwrap(Class iface) throws SQLException {
- //I hope that nothing will call this method (GK)
- throw new UnsupportedOperationException("This operation is not supported because we need to stay compatible " +
- "with Java 1.4 where unwrap() is not defined");
+ return wrappedBean.unwrap(iface);
}
public void configure(Configuration arg0) throws ConfigurationException {
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.java Sat Jan 21 14:22:28 2023
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -17,6 +17,7 @@
package org.apache.cocoon.acting;
import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Collections;
@@ -89,7 +90,7 @@ public class DatabaseCookieAuthenticator
throws Exception {
DataSourceComponent datasource = null;
Connection conn = null;
- Statement st = null;
+ PreparedStatement st = null;
ResultSet rs = null;
// read global parameter settings
@@ -129,8 +130,8 @@ public class DatabaseCookieAuthenticator
return null;
}
- String query = this.getAuthQuery(objectModel, conf, req);
- if (query == null) {
+ st = this.getAuthQuery(objectModel, conf, conn);
+ if (st == null) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("DBCOOKIEAUTH: have not got query");
}
@@ -138,11 +139,7 @@ public class DatabaseCookieAuthenticator
return null;
}
- if (getLogger().isDebugEnabled()) {
- getLogger().debug("DBCOOKIEAUTH: query is: " + query);
- }
- st = conn.createStatement();
- rs = st.executeQuery(query);
+ rs = st.executeQuery();
if (rs.next()) {
if (getLogger().isDebugEnabled()) {
@@ -231,11 +228,10 @@ public class DatabaseCookieAuthenticator
*
* @param objectModel Description of Parameter
* @param conf Description of Parameter
- * @param req Description of Parameter
+ * @param conn Description of Parameter
* @return The authQuery value
*/
- private String getAuthQuery(Map objectModel, Configuration conf, Request req) {
- boolean first_constraint = true;
+ private PreparedStatement getAuthQuery(Map objectModel, Configuration conf, Connection conn) {
StringBuffer queryBuffer = new StringBuffer("SELECT ");
StringBuffer queryBufferEnd = new StringBuffer("");
String dbcol;
@@ -246,6 +242,8 @@ public class DatabaseCookieAuthenticator
Configuration table = conf.getChild("table");
Configuration[] select = table.getChildren("select");
try {
+ Object[] constraintValues = new Object[select.length];
+ int constraints = 0;
for (int i = 0; i < select.length; i++) {
if (i != 0) {
queryBuffer.append(", ");
@@ -277,11 +275,11 @@ public class DatabaseCookieAuthenticator
return null;
}
} else {
- if (!first_constraint) {
+ if (constraints > 0) {
queryBufferEnd.append(" AND ");
}
- queryBufferEnd.append(dbcol + "='" + cookie_value + "'");
- first_constraint = false;
+ queryBufferEnd.append(dbcol + "= ?");
+ constraintValues[constraints++] = cookie_value;
}
}
queryBuffer.append(" FROM ");
@@ -289,7 +287,17 @@ public class DatabaseCookieAuthenticator
if (!queryBufferEnd.toString().trim().equals("")) {
queryBuffer.append(" WHERE ").append(queryBufferEnd);
}
- return queryBuffer.toString();
+
+ getLogger().debug("DBCOOKIEAUTH: query " + queryBuffer);
+
+ PreparedStatement st = conn.prepareStatement(queryBuffer.toString());
+
+ for (int i = 0; i < constraints; i++) {
+ getLogger().debug("DBCOOKIEAUTH: parameter " + (i+1) + " = [" + constraintValues[i] + "]");
+ st.setObject(i+1,constraintValues[i]);
+ }
+
+ return st;
} catch (Exception e) {
getLogger().error("Exception: ",e);
return null;
@@ -297,9 +305,9 @@ public class DatabaseCookieAuthenticator
}
public static Cookie getCookie(Map objectModel, String cookieName) {
-
+
Request request = ObjectModelHelper.getRequest(objectModel);
-
+
Cookie[] cookies = request.getCocoonCookies();
if (cookies != null) {
for(int count = 0; count < cookies.length; count++) {
@@ -309,7 +317,7 @@ public class DatabaseCookieAuthenticator
}
}
}
-
+
return null;
}
/**
@@ -340,7 +348,7 @@ public class DatabaseCookieAuthenticator
String type = select[i].getAttribute("type", "");
// "string" is the default type
if (StringUtils.isEmpty(type.trim()) || "string".equals(type)) {
- o = s;
+ o = s;
} else if ("long".equals(type)) {
Long l = Long.decode(s);
o = l;
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/src/main/java/org/apache/cocoon/databases/ibatis/ExcaliburDataSourceFactory.java Sat Jan 21 14:22:28 2023
@@ -19,7 +19,9 @@ package org.apache.cocoon.databases.ibat
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Map;
+import java.util.logging.Logger;
import javax.sql.DataSource;
@@ -63,13 +65,13 @@ public class ExcaliburDataSourceFactory
final ServiceManager manager = EnvironmentHelper.getSitemapServiceManager();
if ( manager == null ) {
throw new RuntimeException("Cocoon sitemap service manager is not available for " + this.getClass().getName() + "." +
- " Make sure that you're initializing iBatis during an active request and not on startup.");
+ " Make sure that you're initializing iBatis during an active request and not on startup.");
}
try {
this.datasource = (DataSourceComponent)manager.lookup(DataSourceComponent.ROLE + '/' + connection);
} catch (ServiceException e) {
throw new CascadingRuntimeException("Unable to lookup data source with name " + connection + "." +
- " Check the cocoon.xconf and the iBatis sqlMapConfig.", e);
+ " Check the cocoon.xconf and the iBatis sqlMapConfig.", e);
}
}
@@ -95,6 +97,13 @@ public class ExcaliburDataSourceFactory
return this.timeout;
}
+ /**
+ * Required by JDK1.7.
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
public PrintWriter getLogWriter() throws SQLException {
return this.writer;
}
@@ -105,7 +114,7 @@ public class ExcaliburDataSourceFactory
public void setLogWriter(PrintWriter out) throws SQLException {
this.writer = out;
- }
+ }
/**
* Required by JDK1.6.
Modified: cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jcr/cocoon-jcr-impl/pom.xml Sat Jan 21 14:22:28 2023
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
-
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-jcr</artifactId>
@@ -31,19 +31,19 @@
<artifactId>cocoon-jcr-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>JCR Block Implementation</name>
- <url>http://cocoon.apache.org/${docs.m.jcr.relPath}</url>
-
+ <url>http://cocoon.apache.org/${docs.m.jcr.relPath}</url>
+
<distributionManagement>
<site>
<id>website</id>
<url>${docs.deploymentBaseUrl}/${docs.m.jcr.relPath}</url>
</site>
- </distributionManagement>
-
+ </distributionManagement>
+
<properties>
- <docs.name>Cocoon Apples</docs.name>
+ <docs.name>Cocoon Apples</docs.name>
<docs.version>1.0</docs.version>
- </properties>
+ </properties>
<dependencies>
<dependency>
@@ -52,23 +52,23 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-sitemap-impl</artifactId>
+ <artifactId>cocoon-sitemap-impl</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-core</artifactId>
+ <artifactId>cocoon-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
+ <artifactId>jcr</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>slide</groupId>
@@ -81,6 +81,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -105,7 +111,7 @@
<artifactId>poi</artifactId>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>daisy</id>
@@ -121,7 +127,7 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</profile>
- </profiles>
+ </profiles>
</project>
\ No newline at end of file
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Sat Jan 21 14:22:28 2023
@@ -47,8 +47,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>eclipse</groupId>
- <artifactId>jdtcore</artifactId>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java Sat Jan 21 14:22:28 2023
@@ -216,7 +216,7 @@ public class XSPExpressionParser {
parser.setState(EXPRESSION_CHAR_STATE);
break;
- case '´':
+ case '´':
parser.append(ch);
parser.setState(EXPRESSION_SHELL_STATE);
break;
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java Sat Jan 21 14:22:28 2023
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -64,7 +64,7 @@ public class EclipseJavaCompiler impleme
boolean debug;
String sourceDir;
- String sourceFile;
+ String sourceFile;
String destDir;
String sourceEncoding;
int compilerComplianceLevel;
@@ -99,15 +99,15 @@ public class EclipseJavaCompiler impleme
}
public void setEncoding(String encoding) {
- this.sourceEncoding = encoding;
+ this.sourceEncoding = encoding;
}
-
+
/**
* Set the version of the java source code to be compiled
*
* @param compilerComplianceLevel The version of the JVM for which the code was written.
* i.e: 130 = Java 1.3, 140 = Java 1.4 and 150 = Java 1.5
- *
+ *
* @since 2.1.7
*/
public void setCompilerComplianceLevel(int compilerComplianceLevel) {
@@ -132,7 +132,7 @@ public class EclipseJavaCompiler impleme
String str = fileName;
str = str.replace('\\', '/');
if (sourceDir != null) {
- String prefix =
+ String prefix =
new File(sourceDir).getCanonicalPath().replace('\\', '/');
if (canonical != null) {
if (canonical.startsWith(prefix)) {
@@ -175,7 +175,7 @@ public class EclipseJavaCompiler impleme
public char[] getFileName() {
return className.toCharArray();
}
-
+
public char[] getContents() {
char[] result = null;
FileReader fr = null;
@@ -201,7 +201,7 @@ public class EclipseJavaCompiler impleme
}
return result;
}
-
+
public char[] getMainTypeName() {
int dot = className.lastIndexOf('.');
if (dot > 0) {
@@ -209,7 +209,7 @@ public class EclipseJavaCompiler impleme
}
return className.toCharArray();
}
-
+
public char[][] getPackageName() {
StringTokenizer izer = new StringTokenizer(className, ".");
char[][] result = new char[izer.countTokens()-1][];
@@ -247,24 +247,24 @@ public class EclipseJavaCompiler impleme
result.append(typeName);
return findType(result.toString());
}
-
+
private NameEnvironmentAnswer findType(String className) {
try {
if (className.equals(targetClassName)) {
- ICompilationUnit compilationUnit =
+ ICompilationUnit compilationUnit =
new CompilationUnit(sourceFile, className);
- return
+ return
new NameEnvironmentAnswer(compilationUnit, null);
}
- String resourceName =
+ String resourceName =
className.replace('.', '/') + ".class";
- InputStream is =
+ InputStream is =
classLoader.getResourceAsStream(resourceName);
if (is != null) {
byte[] classBytes;
byte[] buf = new byte[8192];
- ByteArrayOutputStream baos =
+ ByteArrayOutputStream baos =
new ByteArrayOutputStream(buf.length);
int count;
while ((count = is.read(buf, 0, buf.length)) > 0) {
@@ -273,17 +273,17 @@ public class EclipseJavaCompiler impleme
baos.flush();
classBytes = baos.toByteArray();
char[] fileName = className.toCharArray();
- ClassFileReader classFileReader =
- new ClassFileReader(classBytes, fileName,
+ ClassFileReader classFileReader =
+ new ClassFileReader(classBytes, fileName,
true);
- return
+ return
new NameEnvironmentAnswer(classFileReader, null);
}
} catch (IOException exc) {
- handleError(className, -1, -1,
+ handleError(className, -1, -1,
exc.getMessage());
} catch (org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException exc) {
- handleError(className, -1, -1,
+ handleError(className, -1, -1,
exc.getMessage());
}
return null;
@@ -294,7 +294,7 @@ public class EclipseJavaCompiler impleme
return false;
}
String resourceName = result.replace('.', '/') + ".class";
- InputStream is =
+ InputStream is =
classLoader.getResourceAsStream(resourceName);
return is == null;
}
@@ -322,7 +322,7 @@ public class EclipseJavaCompiler impleme
// EMPTY
}
};
- final IErrorHandlingPolicy policy =
+ final IErrorHandlingPolicy policy =
DefaultErrorHandlingPolicies.proceedWithAllProblems();
final Map settings = new HashMap(9);
settings.put(CompilerOptions.OPTION_LineNumberAttribute,
@@ -340,6 +340,18 @@ public class EclipseJavaCompiler impleme
}
// Set the sourceCodeVersion
switch (this.compilerComplianceLevel) {
+ case 180:
+ settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
+ settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);
+ break;
+ case 170:
+ settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
+ settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7);
+ break;
+ case 160:
+ settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+ settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);
+ break;
case 150:
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5);
settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5);
@@ -352,6 +364,15 @@ public class EclipseJavaCompiler impleme
}
// Set the target platform
switch (SystemUtils.JAVA_VERSION_INT) {
+ case 180:
+ settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_8);
+ break;
+ case 170:
+ settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7);
+ break;
+ case 160:
+ settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6);
+ break;
case 150:
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5);
break;
@@ -361,7 +382,7 @@ public class EclipseJavaCompiler impleme
default:
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3);
}
- final IProblemFactory problemFactory =
+ final IProblemFactory problemFactory =
new DefaultProblemFactory(Locale.getDefault());
final ICompilerRequestor requestor = new ICompilerRequestor() {
@@ -387,7 +408,7 @@ public class EclipseJavaCompiler impleme
className.append(compoundName[j]);
}
byte[] bytes = classFile.getBytes();
- String outFile = destDir + "/" +
+ String outFile = destDir + "/" +
className.toString().replace('.', '/') + ".class";
FileOutputStream fout = new FileOutputStream(outFile);
BufferedOutputStream bos = new BufferedOutputStream(fout);
@@ -400,7 +421,7 @@ public class EclipseJavaCompiler impleme
}
}
};
- ICompilationUnit[] compilationUnits =
+ ICompilationUnit[] compilationUnits =
new ICompilationUnit[classNames.length];
for (int i = 0; i < compilationUnits.length; i++) {
String className = classNames[i];
@@ -416,7 +437,7 @@ public class EclipseJavaCompiler impleme
}
void handleError(String className, int line, int column, Object errorMessage) {
- String fileName =
+ String fileName =
className.replace('.', File.separatorChar) + ".java";
if (column < 0) column = 0;
errors.add(new CompilerError(fileName,
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl Sat Jan 21 14:22:28 2023
@@ -248,7 +248,6 @@ Parameter '<xsl:value-of select="$name"/
<xsl:when test="esql:pool">
try {
_esql_connection = new Cocoon2EsqlConnection( (DataSourceComponent) _esql_get_selector().select(String.valueOf(<xsl:copy-of select="$pool"/>)) );
- setupLogger(_esql_connection);
<xsl:if test="esql:allow-multiple-results">
_esql_connection.setMultipleResults(String.valueOf(<xsl:copy-of select="$allow-multiple-results"/>));
@@ -268,7 +267,6 @@ Parameter '<xsl:value-of select="$name"/
</xsl:if>
try {
_esql_connection = new Cocoon2EsqlConnection();
- setupLogger(_esql_connection);
_esql_connection.setURL(String.valueOf(<xsl:copy-of select="$dburl"/>));
<xsl:if test="esql:username">
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Sat Jan 21 14:22:28 2023
@@ -29,7 +29,7 @@
</parent>
<artifactId>cocoon-blocks-modules</artifactId>
<version>6-SNAPSHOT</version>
- <name>Cocoon Blocks [modules]</name>
+ <name>Cocoon Blocks [modules]</name>
<packaging>pom</packaging>
<build>
@@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0-M3</version>
+ <version>1.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -75,33 +75,33 @@
<name>org.apache.cocoon.mode</name>
<value>dev</value>
</systemProperty>
- </systemProperties>
+ </systemProperties>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
-
+
<modules>
<module>cocoon-ajax/cocoon-ajax-impl</module>
- <module>cocoon-ajax/cocoon-ajax-sample</module>
+ <module>cocoon-ajax/cocoon-ajax-sample</module>
<module>cocoon-apples/cocoon-apples-impl</module>
- <module>cocoon-apples/cocoon-apples-sample</module>
+ <module>cocoon-apples/cocoon-apples-sample</module>
<module>cocoon-core-sample/cocoon-core-additional-sample</module>
- <module>cocoon-core-sample/cocoon-core-main-sample</module>
+ <module>cocoon-core-sample/cocoon-core-main-sample</module>
<module>cocoon-flowscript/cocoon-flowscript-impl</module>
<module>cocoon-forms/cocoon-forms-impl</module>
- <module>cocoon-forms/cocoon-forms-sample</module>
- <module>cocoon-it</module>
+ <module>cocoon-forms/cocoon-forms-sample</module>
+ <module>cocoon-it</module>
<module>cocoon-linkrewriter/cocoon-linkrewriter-impl</module>
<module>cocoon-linkrewriter/cocoon-linkrewriter-sample</module>
<module>cocoon-template/cocoon-template-impl</module>
- <module>cocoon-template/cocoon-template-sample</module>
+ <module>cocoon-template/cocoon-template-sample</module>
<module>cocoon-samples-style/cocoon-samples-style-default</module>
<module>cocoon-batik/cocoon-batik-impl</module>
<module>cocoon-batik/cocoon-batik-sample</module>
<module>cocoon-welcome</module>
</modules>
-
+
<profiles>
<profile>
<id>eventcache-jms</id>
@@ -109,7 +109,7 @@
<module>cocoon-eventcache/cocoon-eventcache-impl</module>
<module>cocoon-eventcache/cocoon-eventcache-sample</module>
<module>cocoon-jms/cocoon-jms-impl</module>
- <module>cocoon-jms/cocoon-jms-sample</module>
+ <module>cocoon-jms/cocoon-jms-sample</module>
</modules>
</profile>
<profile>
@@ -125,15 +125,15 @@
<module>cocoon-auth/cocoon-acegisecurity-sample</module>
<module>cocoon-auth/cocoon-auth-api</module>
<module>cocoon-auth/cocoon-auth-impl</module>
- <module>cocoon-auth/cocoon-auth-sample</module>
+ <module>cocoon-auth/cocoon-auth-sample</module>
<module>cocoon-authentication-fw/cocoon-authentication-fw-impl</module>
<module>cocoon-authentication-fw/cocoon-authentication-fw-sample</module>
<module>cocoon-axis/cocoon-axis-impl</module>
<module>cocoon-axis/cocoon-axis-sample</module>
<module>cocoon-bsf/cocoon-bsf-impl</module>
<module>cocoon-bsf/cocoon-bsf-sample</module>
- <module>cocoon-captcha/cocoon-captcha-impl</module>
- <module>cocoon-captcha/cocoon-captcha-sample</module>
+<!-- <module>cocoon-captcha/cocoon-captcha-impl</module>-->
+<!-- <module>cocoon-captcha/cocoon-captcha-sample</module>-->
<!--<module>cocoon-chaperon/cocoon-chaperon-impl</module>
<module>cocoon-chaperon/cocoon-chaperon-sample</module>-->
<module>cocoon-cron/cocoon-cron-impl</module>
@@ -154,13 +154,13 @@
<module>cocoon-faces/cocoon-faces-impl</module>
<module>cocoon-faces/cocoon-faces-sample</module>
<module>cocoon-fop/cocoon-fop-impl</module>
- <module>cocoon-fop/cocoon-fop-sample</module>
+ <module>cocoon-fop/cocoon-fop-sample</module>
<module>cocoon-fop/cocoon-fop-ng-impl</module>
<module>cocoon-fop/cocoon-fop-ng-sample</module>
<module>cocoon-html/cocoon-html-impl</module>
- <module>cocoon-html/cocoon-html-sample</module>
- <module>cocoon-imageop/cocoon-imageop-impl</module>
- <module>cocoon-imageop/cocoon-imageop-sample</module>
+ <module>cocoon-html/cocoon-html-sample</module>
+<!-- <module>cocoon-imageop/cocoon-imageop-impl</module>-->
+<!-- <module>cocoon-imageop/cocoon-imageop-sample</module>-->
<module>cocoon-itext/cocoon-itext-impl</module>
<module>cocoon-itext/cocoon-itext-sample</module>
<!-- Java flow was excluded from building because org.apache.commons:javaflow:jar:1.0-SNAPSHOT is not available on any repository -->
@@ -177,7 +177,7 @@
<module>cocoon-lucene/cocoon-lucene-impl</module>
<module>cocoon-lucene/cocoon-lucene-sample</module>
<module>cocoon-mail/cocoon-mail-impl</module>
- <module>cocoon-mail/cocoon-mail-sample</module>
+ <module>cocoon-mail/cocoon-mail-sample</module>
<module>cocoon-midi/cocoon-midi-impl</module>
<module>cocoon-midi/cocoon-midi-sample</module>
<module>cocoon-naming/cocoon-naming-impl</module>
@@ -226,11 +226,11 @@
</modules>
</profile>
</profiles>
-
+
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/trunk/blocks</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2/cocoon-blocks-modules</developerConnection>
<url>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-2/cocoon-blocks-modules</url>
</scm>
-
+
</project>
Modified: cocoon/trunk/commons/KEYS
URL: http://svn.apache.org/viewvc/cocoon/trunk/commons/KEYS?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/commons/KEYS (original)
+++ cocoon/trunk/commons/KEYS Sat Jan 21 14:22:28 2023
@@ -1014,3 +1014,53 @@ NLSsmD7Xrcs6JRQCsgAj4SGVyblINlGrpeZMN8bc
LIDSu1DWBBT0HPiM1zjfMT5ZiQ==
=MjiJ
-----END PGP PUBLIC KEY BLOCK-----
+
+pub rsa3072 2023-01-06 [SC]
+ F0AD65A6D499962138EBE86EC5FC28B098EB4F35
+uid [ absoluta ] Javier Puerto (Apache sign) <[email protected]>
+sig 3 C5FC28B098EB4F35 2023-01-06 Javier Puerto (Apache sign) <[email protected]>
+sub rsa3072 2023-01-06 [E]
+sig C5FC28B098EB4F35 2023-01-06 Javier Puerto (Apache sign) <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+m3UohwhChvykmIEr+ElK9ZEJkaawDwpnZkO2
+=8cbR
+-----END PGP PUBLIC KEY BLOCK-----
+
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StreamGenerator.java Sat Jan 21 14:22:28 2023
@@ -5,9 +5,9 @@
* The ASF licenses this file to You 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.
@@ -20,11 +20,13 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.excalibur.xml.sax.SAXParser;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.apache.avalon.framework.activity.Initializable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ResourceNotFoundException;
import org.apache.cocoon.environment.ObjectModelHelper;
@@ -32,9 +34,9 @@ import org.apache.cocoon.environment.Req
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.servlet.multipart.Part;
import org.apache.cocoon.util.PostInputStream;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
/**
* The <code>StreamGenerator</code> is a class that reads XML from a request
@@ -67,17 +69,28 @@ import org.xml.sax.SAXException;
*
* @version $Id$
*/
-public class StreamGenerator extends ServiceableGenerator {
+public class StreamGenerator extends ServiceableGenerator implements Initializable {
/** The parameter holding the name associated with the xml data **/
public static final String FORM_NAME = "form-name";
+
+ private SAXParserFactory factory;
+
+ @Override
+ public void initialize() throws Exception {
+ factory = SAXParserFactory.newInstance();
+ factory.setNamespaceAware(true);
+ factory.setXIncludeAware(false);
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ }
+
/**
* Generate XML data out of request InputStream.
*/
public void generate()
throws IOException, SAXException, ProcessingException {
- SAXParser parser = null;
int len = 0;
String contentType;
@@ -110,7 +123,7 @@ public class StreamGenerator extends Ser
} else if (xmlObject instanceof Part) {
xmlReader = new InputStreamReader(((Part) xmlObject).getInputStream());
} else {
- throw new ProcessingException("Unknown request object encountered named " +
+ throw new ProcessingException("Unknown request object encountered named " +
parameter + " : " + xmlObject);
}
@@ -143,19 +156,22 @@ public class StreamGenerator extends Ser
source.setEncoding(charset);
}
- parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
- parser.parse(source, super.xmlConsumer);
+ SAXParser parser = factory.newSAXParser();
+ XMLReader xmlReader = parser.getXMLReader();
+ xmlReader.setContentHandler(super.xmlConsumer);
+ xmlReader.setProperty( "http://xml.org/sax/properties/lexical-handler", super.xmlConsumer );
+ xmlReader.setFeature( "http://xml.org/sax/features/namespaces", true );
+
+ xmlReader.parse(source);
} catch (IOException e) {
getLogger().error("StreamGenerator.generate()", e);
throw new ResourceNotFoundException("StreamGenerator could not find resource", e);
} catch (SAXException e) {
getLogger().error("StreamGenerator.generate()", e);
throw(e);
- } catch (ServiceException e) {
+ } catch (ParserConfigurationException e) {
getLogger().error("Could not get parser", e);
throw new ProcessingException("Exception in StreamGenerator.generate()", e);
- } finally {
- this.manager.release(parser);
}
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/src/main/java/org/apache/cocoon/components/modules/input/NamingInputModule.java Sat Jan 21 14:22:28 2023
@@ -34,7 +34,11 @@ import java.util.Properties;
* <p>This module accept any configuration parameters and passes them as
* properties to the InitialContext. When connecting to the Naming context
* of the server Cocoon is running in, no parameters are required.</p>
- *
+ * <br/>
+ * <p><b>Security note:</b> Use secure parameters only with this module as
+ * it performs a JNDI lookup that can be exploited for remote code execution
+ * (RCE).</p>
+ * <br/>
* <p>Example module configuration when connecting to external WebLogic server:
* <pre>
* <java.naming.factory.initial>weblogic.jndi.WLInitialContextFactory</java.naming.factory.initial>
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Sat Jan 21 14:22:28 2023
@@ -60,7 +60,7 @@
<exclude>**/cocoon/it/**</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
</plugins>
<finalName>cocoon-webapp</finalName>
</build>
@@ -104,7 +104,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
</dependency>
-
+
<!-- Cocoon Sample Blocks -->
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -118,7 +118,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-sample</artifactId>
</dependency>
-
+
<!-- Integration Tests -->
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -226,10 +226,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-bsf-sample</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-captcha-sample</artifactId>
- </dependency>
+ </dependency-->
<!--<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-chaperon-sample</artifactId>
@@ -275,10 +275,10 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-html-sample</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-imageop-sample</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.apache.cocoon</groupId>-->
+<!-- <artifactId>cocoon-imageop-sample</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-itext-sample</artifactId>
Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Sat Jan 21 14:22:28 2023
@@ -360,7 +360,7 @@
<organizationUrl>http://www.apache.org</organizationUrl>
<roles>
<role>ASF member</role>
- <role>PMC chair</role>
+ <role>PMC chair</role>
<role>PMC member</role>
<role>Committer</role>
</roles>
@@ -506,7 +506,7 @@
<roles>
<role>Emeritus PMC Member</role>
<role>Emeritus Committer</role>
- </roles>
+ </roles>
<timezone>+1</timezone>
</developer>
<developer>
@@ -1751,9 +1751,9 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>eclipse</groupId>
- <artifactId>jdtcore</artifactId>
- <version>3.1.0</version>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.26.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jena</groupId>
@@ -1970,22 +1970,22 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -2001,7 +2001,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -2233,7 +2233,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-block-deployment</artifactId>
<version>1.1.0</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-blocks-fw-demo1</artifactId>
@@ -2773,7 +2773,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-impl</artifactId>
@@ -3056,12 +3056,12 @@
<exclude>src/site/**</exclude>
</excludes>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-it-fw</artifactId>
<version>1.0.0-M1</version>
- </plugin>
+ </plugin>
</plugins>
</pluginManagement>
@@ -3237,7 +3237,7 @@
<docs.m.configuration-api.relPath>${docs.m.site-configuration.relPath}configuration-api/</docs.m.configuration-api.relPath>
<docs.m.spring-configurator.relPath>${docs.m.site-configuration.relPath}spring-configurator/</docs.m.spring-configurator.relPath>
<docs.m.jnet.relPath>subprojects/jnet/</docs.m.jnet.relPath>
- <docs.m.block-deployment.relPath>subprojects/block-deployment/</docs.m.block-deployment.relPath>
+ <docs.m.block-deployment.relPath>subprojects/block-deployment/</docs.m.block-deployment.relPath>
<!-- Path and version properties: blocks -->
<docs.m.ajax.version>1.0</docs.m.ajax.version>
<docs.m.ajax.relPath>2.2/blocks/ajax/${docs.m.ajax.version}/</docs.m.ajax.relPath>
@@ -3329,7 +3329,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
</plugins>
</build>
</profile>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Sat Jan 21 14:22:28 2023
@@ -59,7 +59,7 @@
</plugins>
</build>
- <profiles>
+<!-- <profiles>
<profile>
<id>daisy</id>
<build>
@@ -79,6 +79,6 @@
</plugins>
</build>
</profile>
- </profiles>
+ </profiles> -->
</project>
Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=1906870&r1=1906869&r2=1906870&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Sat Jan 21 14:22:28 2023
@@ -40,7 +40,7 @@
<module>cocoon-maven-reports</module>
<module>cocoon-maven-docs-cleaner-plugin</module>
<module>cocoon-maven-javadocs-script-report</module>
- <module>cocoon-sitemaptags2daisy-plugin</module>
+<!-- <module>cocoon-sitemaptags2daisy-plugin</module> -->
</modules>
<scm>