Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Upgrading derby and fixing assembly logic. #22606

Merged
jigneshbhodia merged 3 commits into from
Jan 7, 2019
Merged

Upgrading derby and fixing assembly logic. #22606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ae129b
Upgrading derby and fixing assembly logic.
ankathur Dec 20, 2018
87f7ed3
correcting transaction tests
ankathur Jan 2, 2019
78929a9
adding jvm options and policy update for derby 10.14.2.0
ankathur Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appserver/distributions/glassfish/src/main/assembly/glassfish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

<!-- javadb -->
<fileSet>
<directory>${temp.dir}/derby/db-derby-${derby.version}-bin</directory>
<directory>${temp.dir}/derby/</directory>
<excludes>
<exclude>demo/**</exclude>
<exclude>docs/**</exclude>
Expand Down
2 changes: 1 addition & 1 deletion appserver/distributions/web/src/main/assembly/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

<!-- javadb -->
<fileSet>
<directory>${temp.dir}/derby/db-derby-${derby.version}-bin</directory>
<directory>${temp.dir}/derby/</directory>
<excludes>
<exclude>demo/**</exclude>
<exclude>docs/**</exclude>
Expand Down
2 changes: 1 addition & 1 deletion appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<dbschema.version>6.6</dbschema.version>
<schema2beans.version>6.6</schema2beans.version>
<mq.version>5.1.2-b01</mq.version>
<derby.version>10.13.1.1</derby.version>
<derby.version>10.13.1.2</derby.version>
Copy link

@pzygielo pzygielo Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this official derby release? I can't see it in maven central.
Why not upgrade to 10.14.2.0?

Copy link
Member Author

@ankathur ankathur Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It comes out of repackaged project which is packaging derby 10.14.2.0. It is released as "org.glassfish.external:derby"

Copy link

@pzygielo pzygielo Jan 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It comes out of repackaged project which is packaging derby 10.14.2.0. It is released as "org.glassfish.external:derby"
thanks for update

I found it a bit confusing (10.13 vs. 10.14). [It wouldn't be if versions were much, much different, and not so similar 😉.)

But you are definitely right, derby-10.13.1.2.pom references 10.14.2.0.
Thanks for the reply.

<weld.version>3.0.0.Final</weld.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<websocket-api.version>1.1</websocket-api.version>
Expand Down
3 changes: 2 additions & 1 deletion appserver/tests/appserv-tests/devtests/transaction/ee/ee.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
<arg line="${env.S1AS_HOME}/databases"/>
<arg line="--dbport"/>
<arg line="${db.port}"/>
<arg line="--jvmoptions"/>
<arg line="'-Djava.security.manager -Djava.security.policy=${env.S1AS_HOME}/domains/domain1/config/server.policy'"/>
</exec>
</target>

Expand Down Expand Up @@ -193,4 +195,3 @@
<param name="db.url" value="jdbc:derby://localhost:${db.port}/${db.name};create=true;"/>
</antcall>
</target>

24 changes: 13 additions & 11 deletions nucleus/admin/template/src/main/resources/config/server.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ grant codeBase "file:${com.sun.aas.imqLib}/-" {
grant codeBase "file:${com.sun.aas.derbyRoot}/lib/-" {
permission java.lang.RuntimePermission "createClassLoader";
permission java.io.FilePermission "<<ALL FILES>>", "read,write";
};
};


// permission for JDK's tools.jar to enable webservice annotation processing
// at runtime by wsgen tool:
// at runtime by wsgen tool:
// permission java.lang.RuntimePermission "createClassLoader";
//
// permission for JDK's tools.jar to sign JARs at runtime for
// permission for JDK's tools.jar to sign JARs at runtime for
// Java Web Start support:
// permissions java.security.AllPermission;
// on the advice of the JDK tools folks. Should be refined later.
Expand Down Expand Up @@ -102,7 +102,7 @@ grant {
permission java.lang.RuntimePermission "queuePrintJob";
permission java.net.SocketPermission "*", "connect";

// work-around for pointbase bug 4864405
// work-around for pointbase bug 4864405
permission java.io.FilePermission "${com.sun.aas.instanceRoot}${/}lib${/}databases${/}-", "delete";
permission java.io.FilePermission "${java.io.tmpdir}${/}-", "delete";

Expand All @@ -111,12 +111,12 @@ grant {
permission java.lang.RuntimePermission "modifyThreadGroup";
permission java.lang.RuntimePermission "getClassLoader";
permission java.lang.RuntimePermission "setContextClassLoader";
permission javax.management.MBeanPermission "[com.sun.messaging.jms.*:*]", "*";
// Following needed for CTS to pass with SM on, bug 16344201
permission java.lang.RuntimePermission "closeClassLoader";
permission java.io.SerializablePermission "enableSubstitution";
permission java.security.SecurityPermission "getProperty.package.definition";
permission javax.management.MBeanPermission "[com.sun.messaging.jms.*:*]", "*";

// Following needed for CTS to pass with SM on, bug 16344201
permission java.lang.RuntimePermission "closeClassLoader";
permission java.io.SerializablePermission "enableSubstitution";
permission java.security.SecurityPermission "getProperty.package.definition";
};

// Following grant block is only required by Connectors. If Connectors
Expand Down Expand Up @@ -144,7 +144,9 @@ grant codeBase "file:${com.sun.aas.instanceRoot}/applications/-"{
permission java.io.FilePermission "<<ALL FILES>>", "read,write";
permission org.hibernate.validator.HibernateValidatorPermission "accessPrivateMembers";
};
//Added for changes proposed by Derby 10.12.1.1 (DERBY-6648)
//Added for changes proposed by Derby 10.12.1.1 (DERBY-6648) and Derby 10.14.2.0
grant {
permission org.apache.derby.security.SystemPermission "engine", "usederbyinternals";
permission java.io.FilePermission "<<ALL FILES>>", "write,read";
permission java.security.AllPermission;
};