API tools faq
paste
Advertisement
Guest User

Multiverse repository patch. 010213

a guest
Jan 2nd, 2013
42
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 9.31 KB | None | 0 0
raw download clone embed print report
  1. Index: multiverse/management/CommandMain.java
  2. ===================================================================
  3. --- multiverse/management/CommandMain.java  (revision 9)
  4. +++ multiverse/management/CommandMain.java  (working copy)
  5. @@ -38,8 +38,9 @@
  6.  import gnu.getopt.Getopt;
  7.  
  8.  import sun.management.ConnectorAddressLink;
  9. -import sun.jvmstat.monitor.MonitoredHost;
  10. -import sun.jvmstat.monitor.HostIdentifier;
  11. +import com.sun.jvmstat.monitor.HostIdentifier;
  12. +import com.sun.jvmstat.monitor.MonitorException;
  13. +import com.sun.jvmstat.monitor.MonitoredHost;
  14.  import javax.management.remote.JMXServiceURL;
  15.  import javax.management.remote.JMXConnector;
  16.  import javax.management.remote.JMXConnectorFactory;
  17. @@ -199,10 +200,10 @@
  18.          if (activeVms == null) {
  19.              try {
  20.                  host = MonitoredHost.getMonitoredHost(new HostIdentifier((String)null));
  21. -                activeVms = host.activeVms();
  22. +                activeVms = host.activeVMs();
  23.              } catch (java.net.URISyntaxException e) {
  24.                  throw new InternalError(e.getMessage());
  25. -            } catch (sun.jvmstat.monitor.MonitorException e) {
  26. +            } catch (MonitorException e) {
  27.                  throw new InternalError(e.getMessage());
  28.              }
  29.          }
  30. Index: multiverse/msgsys/DomainServer.java
  31. ===================================================================
  32. --- multiverse/msgsys/DomainServer.java (revision 9)
  33. +++ multiverse/msgsys/DomainServer.java (working copy)
  34. @@ -36,6 +36,9 @@
  35.  import java.nio.ByteBuffer;
  36.  import java.util.concurrent.*;
  37.  import java.net.InetAddress;
  38. +
  39. +import javax.crypto.SecretKey;
  40. +
  41.  import gnu.getopt.Getopt;
  42.  import gnu.getopt.LongOpt;
  43.  
  44. @@ -169,7 +172,7 @@
  45.              scheduler.schedule(new TimeoutRunnable(timeout),
  46.                  timeout, TimeUnit.SECONDS);
  47.  
  48. -        javax.crypto.SecretKey domainKey = SecureTokenUtil.generateDomainKey();
  49. +        SecretKey domainKey = SecureTokenUtil.generateDomainKey();
  50.          // XXX Use a random keyID for now. Ideally, this would be semi-unique.
  51.          long keyId = new Random().nextLong();
  52.          encodedDomainKey = Base64.encodeBytes(SecureTokenUtil.encodeDomainKey(keyId, domainKey));
  53. Index: multiverse/server/engine/ScriptManager.java
  54. ===================================================================
  55. --- multiverse/server/engine/ScriptManager.java (revision 9)
  56. +++ multiverse/server/engine/ScriptManager.java (working copy)
  57. @@ -29,10 +29,16 @@
  58.  package multiverse.server.engine;
  59.  
  60.  import multiverse.server.util.*;
  61. -import org.mozilla.javascript.*;
  62.  
  63. +import sun.org.mozilla.javascript.internal.Context;
  64. +import sun.org.mozilla.javascript.internal.ImporterTopLevel;
  65. +import sun.org.mozilla.javascript.internal.JavaScriptException;
  66. +import sun.org.mozilla.javascript.internal.ScriptableObject;
  67. +
  68.  import java.io.*;
  69.  
  70. +import org.python.core.CompileMode;
  71. +import org.python.core.CompilerFlags;
  72.  import org.python.core.PySystemState;
  73.  import org.python.core.PyObject;
  74.  import org.python.core.PyModule;
  75. @@ -43,6 +49,7 @@
  76.  import org.python.core.imp;
  77.  import org.python.core.__builtin__;
  78.  
  79. +
  80.  public class ScriptManager {
  81.      public ScriptManager() {
  82.      }
  83. @@ -206,7 +213,7 @@
  84.          try {
  85.              Py.setSystemState(pySystemState);
  86.              // runCode(code, locals, globals)
  87. -            Py.runCode(Py.compile_flags(in, filename, "exec",null),
  88. +            Py.runCode(Py.compile_flags(in, filename, CompileMode.exec, new CompilerFlags()),
  89.                  pyLocals, mvmodule.__dict__);
  90.          } catch (RuntimeException e) {
  91.              Log.exception("ScriptManager.runPYFile: file="+filename, e);
  92. @@ -239,7 +246,7 @@
  93.          Py.setSystemState(pySystemState);
  94.  
  95.          // exec(object, globals, locals)
  96. -        Py.exec(Py.compile_flags(script, "<string>", "exec",null),
  97. +        Py.exec(Py.compile_flags(script, "<string>", CompileMode.exec, new CompilerFlags()),
  98.              mvmodule.__dict__, pyLocals);
  99.  
  100.          pySystemState.stdout = saveStdout;
  101. Index: multiverse/server/marshalling/InjectionGenerator.java
  102. ===================================================================
  103. --- multiverse/server/marshalling/InjectionGenerator.java   (revision 9)
  104. +++ multiverse/server/marshalling/InjectionGenerator.java   (working copy)
  105. @@ -30,10 +30,11 @@
  106.  
  107.  import java.util.*;
  108.  import java.io.File;
  109. -import org.apache.bcel.Constants;
  110. -import org.apache.bcel.Repository;
  111. -import org.apache.bcel.classfile.*;
  112. -import org.apache.bcel.generic.*;
  113. +
  114. +import com.sun.org.apache.bcel.internal.*;
  115. +import com.sun.org.apache.bcel.internal.classfile.*;
  116. +import com.sun.org.apache.bcel.internal.generic.*;
  117. +
  118.  import multiverse.server.util.*;
  119.  
  120.  public class InjectionGenerator {
  121. @@ -731,11 +732,7 @@
  122.      }
  123.      
  124.      protected boolean referencesInterface(ObjectType type) {
  125. -        try {
  126. -            return type.referencesInterfaceExact();
  127. -        } catch (ClassNotFoundException e) {
  128. -            return false;
  129. -        }
  130. +        return type.referencesInterface();
  131.      }
  132.  
  133.      protected boolean doesOrWillHandleMarshallable(ObjectType type) {
  134. @@ -772,12 +769,8 @@
  135.      }
  136.  
  137.      public static boolean interfaceClass(String s) {
  138. -        try {
  139. -            JavaClass jc = Repository.lookupClass(s);
  140. -            return !jc.isClass();
  141. -        } catch (ClassNotFoundException e) {
  142. -            return false;
  143. -        }
  144. +        JavaClass jc = Repository.lookupClass(s);
  145. +       return !jc.isClass();
  146.      }
  147.  
  148.      protected static LinkedList<Field> getValidClassFields(JavaClass c) {
  149. Index: multiverse/server/marshalling/MarshallingClassLoader.java
  150. ===================================================================
  151. --- multiverse/server/marshalling/MarshallingClassLoader.java   (revision 9)
  152. +++ multiverse/server/marshalling/MarshallingClassLoader.java   (working copy)
  153. @@ -28,7 +28,7 @@
  154.  
  155.  package multiverse.server.marshalling;
  156.  
  157. -import org.apache.bcel.util.ClassPath;
  158. +import com.sun.org.apache.bcel.internal.util.ClassPath;
  159.  import java.util.*;
  160.  
  161.  /**
  162. Index: multiverse/server/marshalling/MarshallingRuntime.java
  163. ===================================================================
  164. --- multiverse/server/marshalling/MarshallingRuntime.java   (revision 9)
  165. +++ multiverse/server/marshalling/MarshallingRuntime.java   (working copy)
  166. @@ -30,8 +30,12 @@
  167.  
  168.  import java.util.*;
  169.  import java.io.*;
  170. -import org.apache.bcel.classfile.*;
  171. -import org.apache.bcel.Repository;
  172. +
  173. +import com.sun.org.apache.bcel.internal.Constants;
  174. +import com.sun.org.apache.bcel.internal.Repository;
  175. +import com.sun.org.apache.bcel.internal.classfile.*;
  176. +import com.sun.org.apache.bcel.internal.generic.Type;
  177. +
  178.  import multiverse.server.network.*;
  179.  import multiverse.server.util.*;
  180.  
  181. @@ -1105,8 +1109,8 @@
  182.                      checkClassPresent(c, superclass, missingTypes);
  183.                  LinkedList<Field> fields = InjectionGenerator.getValidClassFields(c);
  184.                  for (Field f : fields) {
  185. -                    org.apache.bcel.generic.Type fieldType = f.getType();
  186. -                    if (fieldType.getType() == org.apache.bcel.Constants.T_ARRAY) {
  187. +                    Type fieldType = f.getType();
  188. +                    if (fieldType.getType() == Constants.T_ARRAY) {
  189.                          Log.error("For class '" + className + "', field '" + f.getName() + "' is an array, and arrays are not supported");
  190.                          someMissing = true;
  191.                      }
  192. @@ -1117,10 +1121,12 @@
  193.                          if (name.equals("java.lang.Object"))
  194.                              continue;
  195.                          JavaClass fieldClass = javaClassOrNull(name);
  196. -                        if (fieldClass.isEnum()) {
  197. +                        if (fieldClass.isClass() != true) { // fieldClass.isEnum()) {
  198. +                           // TODO: MAJOR HACK ABOVE
  199.                              Log.error("For class '" + className + "', field '" + f.getName() + "' is an enum, and enums are not supported");
  200.                              someMissing = true;
  201.                          }
  202. +                        
  203.                          if (fieldClass == null) {
  204.                              Log.error("For class '" + className + "', could not find field '" + f.getName() + "' class '" + name + "'");
  205.                              someMissing = true;
  206. Index: multiverse/server/util/Log.java
  207. ===================================================================
  208. --- multiverse/server/util/Log.java (revision 9)
  209. +++ multiverse/server/util/Log.java (working copy)
  210. @@ -30,6 +30,8 @@
  211.  
  212.  import java.util.*;
  213.  
  214. +import org.apache.log4j.Logger;
  215. +
  216.  // checked for locks
  217.  
  218.  public class Log {
  219. Index: multiverse/server/util/SecureTokenUtil.java
  220. ===================================================================
  221. --- multiverse/server/util/SecureTokenUtil.java (revision 9)
  222. +++ multiverse/server/util/SecureTokenUtil.java (working copy)
  223. @@ -28,7 +28,16 @@
  224.  
  225.  package multiverse.server.util;
  226.  
  227. +import java.security.InvalidKeyException;
  228. +import java.security.NoSuchAlgorithmException;
  229. +
  230. +import javax.crypto.BadPaddingException;
  231. +import javax.crypto.Cipher;
  232. +import javax.crypto.IllegalBlockSizeException;
  233. +import javax.crypto.NoSuchPaddingException;
  234.  import javax.crypto.SecretKey;
  235. +import javax.crypto.spec.SecretKeySpec;
  236. +
  237.  import javax.crypto.KeyGenerator;
  238.  import java.security.KeyPair;
  239.  import java.security.KeyPairGenerator;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!