Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-339 committing on behalf of Albert 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@570288 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2007-08-28 01:05:18 +00:00
parent 99029c0bda
commit 62b3725596
6 changed files with 78 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
View File

@ -19,6 +19,7 @@
package org.apache.openjpa.meta;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@ -656,9 +657,15 @@ public abstract class AbstractCFMetaDataFactory
if (log.isTraceEnabled())
log.trace(_loc.get("scan-found-names", clss, file));
names.addAll(Arrays.asList(clss));
mapPersistentTypeNames(((File) AccessController
File f = (File) AccessController
.doPrivileged(J2DoPrivHelper
.getAbsoluteFileAction(file))).toURL(), clss);
.getAbsoluteFileAction(file));
try {
mapPersistentTypeNames(AccessController
.doPrivileged(J2DoPrivHelper.toURLAction(f)), clss);
} catch (PrivilegedActionException pae) {
throw (FileNotFoundException) pae.getException();
}
}
}
}

15
openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
View File

@ -517,7 +517,8 @@ public class ProxyManagerImpl
boolean runtime) {
assertNotFinal(type);
Project project = new Project();
BCClass bc = project.loadClass(getProxyClassName(type, runtime));
BCClass bc = (BCClass) AccessController.doPrivileged(J2DoPrivHelper
.loadProjectClassAction(project, getProxyClassName(type, runtime)));
bc.setSuperclass(type);
bc.declareInterface(ProxyCollection.class);
@ -554,7 +555,8 @@ public class ProxyManagerImpl
protected BCClass generateProxyMapBytecode(Class type, boolean runtime) {
assertNotFinal(type);
Project project = new Project();
BCClass bc = project.loadClass(getProxyClassName(type, runtime));
BCClass bc = (BCClass) AccessController.doPrivileged(J2DoPrivHelper
.loadProjectClassAction(project, getProxyClassName(type, runtime)));
bc.setSuperclass(type);
bc.declareInterface(ProxyMap.class);
@ -573,7 +575,8 @@ public class ProxyManagerImpl
protected BCClass generateProxyDateBytecode(Class type, boolean runtime) {
assertNotFinal(type);
Project project = new Project();
BCClass bc = project.loadClass(getProxyClassName(type, runtime));
BCClass bc = (BCClass) AccessController.doPrivileged(J2DoPrivHelper
.loadProjectClassAction(project, getProxyClassName(type, runtime)));
bc.setSuperclass(type);
bc.declareInterface(ProxyDate.class);
@ -592,7 +595,8 @@ public class ProxyManagerImpl
boolean runtime) {
assertNotFinal(type);
Project project = new Project();
BCClass bc = project.loadClass(getProxyClassName(type, runtime));
BCClass bc = (BCClass) AccessController.doPrivileged(J2DoPrivHelper
.loadProjectClassAction(project, getProxyClassName(type, runtime)));
bc.setSuperclass(type);
bc.declareInterface(ProxyCalendar.class);
@ -626,7 +630,8 @@ public class ProxyManagerImpl
}
Project project = new Project();
BCClass bc = project.loadClass(getProxyClassName(type, runtime));
BCClass bc = (BCClass) AccessController.doPrivileged(J2DoPrivHelper
.loadProjectClassAction(project, getProxyClassName(type, runtime)));
bc.setSuperclass(type);
bc.declareInterface(ProxyBean.class);

11
openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
View File

@ -24,6 +24,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.util.ArrayList;
@ -111,8 +112,14 @@ public class FileMetaDataIterator implements MetaDataIterator {
throw new NoSuchElementException();
_file = (File) _itr.next();
return ((File) AccessController.doPrivileged(J2DoPrivHelper
.getAbsoluteFileAction(_file))).toURL();
try {
File f = (File) AccessController.doPrivileged(J2DoPrivHelper
.getAbsoluteFileAction(_file));
return AccessController.doPrivileged(
J2DoPrivHelper.toURLAction(f));
} catch (PrivilegedActionException pae) {
throw (MalformedURLException) pae.getException();
}
}
public InputStream getInputStream() throws IOException {

37
openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
View File

@ -25,6 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.AccessibleObject;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.URL;
@ -69,6 +70,7 @@ import serp.bytecode.Project;
* <li>File.isDirectory
* <li>File.mkdirs
* <li>File.renameTo
* <li>File.toURL
* <li>FileInputStream new
* <li>FileOutputStream new
* <li>System.getProperties
@ -593,6 +595,24 @@ public abstract class J2DoPrivHelper {
};
}
/**
* Return a PrivilegedExceptionAction object for f.toURL().
*
* Requires security policy:
* 'permission java.io.FilePermission "read";'
*
* @return Boolean
* @throws MalformedURLException
*/
public static final PrivilegedExceptionAction toURLAction(final File file)
throws MalformedURLException {
return new PrivilegedExceptionAction() {
public Object run() throws MalformedURLException {
return file.toURL();
}
};
}
/**
* Return a PrivilegedExceptionAction object for new FileInputStream().
*
@ -966,4 +986,21 @@ public abstract class J2DoPrivHelper {
}
};
}
/**
* Return a PrivilegeAction object for Project.loadClass().
*
* Requires security policy:
* 'permission java.lang.RuntimePermission "getClassLoader";'
*
* @return BCClass
*/
public static final PrivilegedAction loadProjectClassAction(
final Project project, final String clazzName) {
return new PrivilegedAction() {
public Object run() {
return project.loadClass(clazzName);
}
};
}
}

8
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
View File

@ -20,6 +20,7 @@ package org.apache.openjpa.persistence;
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedActionException;
@ -458,7 +459,12 @@ public class PersistenceProductDerivation
@Override
public void parse(File file)
throws IOException {
_source = file.toURL();
try {
_source = (URL) AccessController.doPrivileged(J2DoPrivHelper
.toURLAction(file));
} catch (PrivilegedActionException pae) {
throw (MalformedURLException) pae.getException();
}
super.parse(file);
}

7
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
View File

@ -24,6 +24,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -219,8 +220,12 @@ public class PersistenceUnitInfoImpl
if (cp[i].equals(name)
|| cp[i].endsWith(File.separatorChar + name)) {
try {
addJarFile(new File(cp[i]).toURL());
addJarFile((URL) AccessController
.doPrivileged(J2DoPrivHelper
.toURLAction(new File(cp[i]))));
return;
} catch (PrivilegedActionException pae) {
break;
} catch (MalformedURLException mue) {
break;
}