Merge pull request #22858 from endtak/issue_22850_2
Add the DDL files(ejbtimer) for PostgreSQL(eclipse-ee4j#22850)
diff --git a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/JdbcConnectionPool.java b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/JdbcConnectionPool.java
index 4ce183f..fa7fa6e 100644
--- a/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/JdbcConnectionPool.java
+++ b/appserver/jdbc/jdbc-config/src/main/java/org/glassfish/jdbc/config/JdbcConnectionPool.java
@@ -273,7 +273,7 @@
* {@link String }
*/
@Attribute
- @Pattern(regexp="(read-uncommitted||read-committed|repeatable-read|serializable)")
+ @Pattern(regexp="(read-uncommitted|read-committed|repeatable-read|serializable)")
String getTransactionIsolationLevel();
/**
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java
index 2cde5a0..c24cf43 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/reader/MultipartProprietaryReader.java
@@ -97,6 +97,7 @@
String name = "noname";
if (cdParams.containsKey("name")) {
name = cdParams.getProperty("name");
+ name = new String(name.getBytes("ISO8859-1"), "UTF-8");
} else if (cdParams.containsKey("filename")) {
name = cdParams.getProperty("filename");
}
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java
index 8e93efa..147c9c0 100644
--- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java
+++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/writer/MultipartProprietaryWriter.java
@@ -193,7 +193,7 @@
}
contentTypeWriter.writeContentType("multipart", ctType, boundary);
// Write content
- final Writer writer = new BufferedWriter(new OutputStreamWriter(os));
+ final Writer writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));
// boolean isFirst = true;
//Parameters
if (parameters != null) {
