diff --git a/openjpa-kernel-5/pom.xml b/openjpa-kernel-5/pom.xml index 04e559edc..315736ca8 100644 --- a/openjpa-kernel-5/pom.xml +++ b/openjpa-kernel-5/pom.xml @@ -39,6 +39,12 @@ ${pom.version} compile + + org.apache.openjpa + openjpa-lib-5 + ${pom.version} + compile + diff --git a/openjpa-lib-5/pom.xml b/openjpa-lib-5/pom.xml new file mode 100644 index 000000000..6f29d9321 --- /dev/null +++ b/openjpa-lib-5/pom.xml @@ -0,0 +1,55 @@ + + + + 4.0.0 + org.apache.openjpa + openjpa-lib-5 + jar + OpenJPA Utilities 1.5 + OpenJPA Utilities 1.5 + http://openjpa.apache.org + + org.apache.openjpa + openjpa-parent + 1.0.1-SNAPSHOT + + + + org.apache.openjpa + openjpa-lib + ${pom.version} + compile + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + + diff --git a/openjpa-lib-5/src/main/java/org/apache/openjpa/lib/util/J2DoPriv5Helper.java b/openjpa-lib-5/src/main/java/org/apache/openjpa/lib/util/J2DoPriv5Helper.java new file mode 100644 index 000000000..cf42913f3 --- /dev/null +++ b/openjpa-lib-5/src/main/java/org/apache/openjpa/lib/util/J2DoPriv5Helper.java @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.lib.util; + +import java.lang.reflect.AnnotatedElement; +import java.security.PrivilegedAction; + +/** + * Helper class to obtain the Privilege(Exception)Action object to perform + * Java 2 doPrivilege security sensitive function call in the following + * methods: + * + * + * @author Albert Lee + */ + +public abstract class J2DoPriv5Helper extends J2DoPrivHelper { + + /** + * Return a PrivilegeAction object for AnnotatedElement.getAnnotations(). + * + * Requires security policy: + * 'permission java.lang.RuntimePermission "accessDeclaredMembers";' + * + * @return Annotation[] + */ + public static final PrivilegedAction getAnnotationsAction( + final AnnotatedElement element) { + return new PrivilegedAction() { + public Object run() { + return element.getAnnotations(); + } + }; + } + + /** + * Return a PrivilegeAction object for + * AnnotatedElement.getDeclaredAnnotations(). + * + * Requires security policy: + * 'permission java.lang.RuntimePermission "accessDeclaredMembers";' + * + * @return Annotation[] + */ + public static final PrivilegedAction getDeclaredAnnotationsAction( + final AnnotatedElement element) { + return new PrivilegedAction() { + public Object run() { + return element.getDeclaredAnnotations(); + } + }; + } + + /** + * Return a PrivilegeAction object for + * AnnotatedElement.isAnnotationPresent(). + * + * Requires security policy: + * 'permission java.lang.RuntimePermission "accessDeclaredMembers";' + * + * @return Boolean + */ + public static final PrivilegedAction isAnnotationPresentAction( + final AnnotatedElement element, final Class annotationClazz) { + return new PrivilegedAction() { + public Object run() { + return element.isAnnotationPresent(annotationClazz) + ? Boolean.TRUE : Boolean.FALSE; + } + }; + } +} diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java index 391178578..a9d9b4286 100644 --- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java +++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java @@ -24,7 +24,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.AccessibleObject; -import java.lang.reflect.AnnotatedElement; import java.net.InetAddress; import java.net.MalformedURLException; import java.net.ServerSocket; @@ -49,9 +48,6 @@ import serp.bytecode.Project; * methods: *