You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ja...@apache.org on 2022/12/18 21:54:22 UTC
svn commit: r1906076 - in /cocoon/branches/cocoon-2.2.1: blocks/cocoon-xsp/cocoon-xsp-impl/ blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/ blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/coc...
Author: javier
Date: Sun Dec 18 21:54:22 2022
New Revision: 1906076
URL: http://svn.apache.org/viewvc?rev=1906076&view=rev
Log:
COCOON-2372: Update xsp block to java 8 and fix minor bugs.
Modified:
cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java
cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
cocoon/branches/cocoon-2.2.1/parent/pom.xml
Modified: cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?rev=1906076&r1=1906075&r2=1906076&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Sun Dec 18 21:54:22 2022
@@ -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/branches/cocoon-2.2.1/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/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java?rev=1906076&r1=1906075&r2=1906076&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java Sun Dec 18 21:54:22 2022
@@ -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/branches/cocoon-2.2.1/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/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java?rev=1906076&r1=1906075&r2=1906076&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java Sun Dec 18 21:54:22 2022
@@ -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/branches/cocoon-2.2.1/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/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl?rev=1906076&r1=1906075&r2=1906076&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl (original)
+++ cocoon/branches/cocoon-2.2.1/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/resources/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl Sun Dec 18 21:54:22 2022
@@ -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/branches/cocoon-2.2.1/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/cocoon-2.2.1/parent/pom.xml?rev=1906076&r1=1906075&r2=1906076&view=diff
==============================================================================
--- cocoon/branches/cocoon-2.2.1/parent/pom.xml (original)
+++ cocoon/branches/cocoon-2.2.1/parent/pom.xml Sun Dec 18 21:54:22 2022
@@ -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>