You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2010/04/29 13:31:07 UTC
svn commit: r939281 - in /incubator/river/jtsk/trunk/src/net/jini:
exception/ jeri/ security/proxytrust/ space/
Author: peter_firmstone
Date: Thu Apr 29 11:31:06 2010
New Revision: 939281
URL: http://svn.apache.org/viewvc?rev=939281&view=rev
Log:
This is very experimental please comment, suggest improvements etc, where new classes should go etc.
Note changes to follow for methods signatures as per Chris Dolan's suggestions.
Also please check for backward compatibility issues.
Exceptions that replace those from RMI, missing from Java CDC Personal Basis Profile
A Few minor tweaks to imports.
Added:
incubator/river/jtsk/trunk/src/net/jini/exception/
incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java (with props)
incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java (with props)
Modified:
incubator/river/jtsk/trunk/src/net/jini/jeri/BasicJeriExporter.java
incubator/river/jtsk/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java
incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace.java
incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace05.java
Added: incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,34 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class ConnectIOException extends RemoteException {
+ private static final long serialVersionUID = -8087809532704668744L;
+
+ public ConnectIOException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ public ConnectIOException(String msg) {
+ super(msg);
+ }
+}
+
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,67 @@
+/**
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+ *
+ * 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.
+ */
+
+/**
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+/*
+ * 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.
+ */
+
+/**
+ * Shamelessly stolen from Apache Harmony.
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+ */
+package net.jini.exception;
+
+import java.rmi.RemoteException;
+
+
+/**
+ * @com.intel.drl.spec_ref
+ *
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+ */
+public class ExportException extends RemoteException {
+
+ private static final long serialVersionUID = -9155485338494060170L;
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public ExportException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public ExportException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,33 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class MarshalException extends RemoteException {
+ private static final long serialVersionUID = 6223554758134037936L;
+
+ public MarshalException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ public MarshalException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,29 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class NoSuchObjectException extends RemoteException {
+ private static final long serialVersionUID = 6619395951570472985L;
+
+ public NoSuchObjectException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,30 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class ServerError extends RemoteException {
+ private static final long serialVersionUID = 8455284893909696482L;
+
+ public ServerError(String msg, Error cause) {
+ super(msg, cause);
+ }
+}
+
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,33 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class ServerException extends RemoteException {
+ private static final long serialVersionUID = -4775845313121906682L;
+
+ public ServerException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ public ServerException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+/**
+ * Shamelessly stolen from Apache Harmony.
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+ */
+package net.jini.exception;
+
+
+/**
+ * @com.intel.drl.spec_ref
+ *
+ * @author Mikhail A. Markov
+ * @version $Revision: 1.4.4.2 $
+ */
+public class ServerNotActiveException extends Exception {
+
+ private static final long serialVersionUID = 4687940720827538231L;
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public ServerNotActiveException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public ServerNotActiveException() {
+ super();
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,33 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+public class UnknownHostException extends RemoteException {
+ private static final long serialVersionUID = -8152710247442114228L;
+
+ public UnknownHostException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ public UnknownHostException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java?rev=939281&view=auto
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java (added)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java Thu Apr 29 11:31:06 2010
@@ -0,0 +1,41 @@
+/*
+ * 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 net.jini.exception;
+
+import java.rmi.RemoteException;
+
+/**
+ * Shamlessly copied from Apache Harmony.
+ *
+ * This has the same serial version uid as java.rmi.UnmarshalException it is
+ * also perfectly interchangeable with it, it also has no state.
+ *
+ * @since 2.2.0
+ */
+public class UnmarshalException extends RemoteException {
+ private static final long serialVersionUID = 594380845140740218L;
+
+ public UnmarshalException(String msg, Exception cause) {
+ super(msg, cause);
+ }
+
+ public UnmarshalException(String msg) {
+ super(msg);
+ }
+}
Propchange: incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/river/jtsk/trunk/src/net/jini/jeri/BasicJeriExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/jeri/BasicJeriExporter.java?rev=939281&r1=939280&r2=939281&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/jeri/BasicJeriExporter.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/jeri/BasicJeriExporter.java Thu Apr 29 11:31:06 2010
@@ -19,26 +19,14 @@
package net.jini.jeri;
import com.sun.jini.jeri.internal.runtime.BasicExportTable;
-import com.sun.jini.logging.Levels;
import java.lang.ref.WeakReference;
import java.rmi.Remote;
-import java.rmi.RemoteException;
import java.rmi.server.ExportException;
-import java.rmi.server.Unreferenced;
-import java.security.AccessControlContext;
-import java.security.PrivilegedAction;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.jini.config.Configuration;
import net.jini.export.Exporter;
-import net.jini.export.ServerContext;
import net.jini.id.Uuid;
import net.jini.id.UuidFactory;
-import net.jini.io.MarshalInputStream;
-import net.jini.io.context.ClientHost;
-import net.jini.io.context.ClientSubject;
-import net.jini.security.Security;
-import net.jini.security.SecurityContext;
/**
* An <code>Exporter</code> implementation for exporting
@@ -684,6 +672,7 @@ public final class BasicJeriExporter imp
*
* @return the string representation for this exporter
**/
+ @Override
public String toString() {
return "BasicJeriExporter[" + se + "," + id + "]";
}
Modified: incubator/river/jtsk/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java?rev=939281&r1=939280&r2=939281&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/security/proxytrust/ProxyTrustVerifier.java Thu Apr 29 11:31:06 2010
@@ -44,6 +44,8 @@ import net.jini.core.constraint.MethodCo
import net.jini.core.constraint.RemoteMethodControl;
import net.jini.io.MarshalInputStream;
import net.jini.io.ObjectStreamContext;
+// For Java CDC
+//import net.jini.io.UnmarshalException;
import net.jini.loader.CodebaseAccessClassLoader;
import net.jini.security.SecurityContext;
import net.jini.security.TrustVerifier;
Modified: incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace.java?rev=939281&r1=939280&r2=939281&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace.java Thu Apr 29 11:31:06 2010
@@ -17,13 +17,15 @@
*/
package net.jini.space;
-import net.jini.core.entry.*;
-import net.jini.entry.*;
-import net.jini.core.transaction.*;
-import net.jini.core.event.*;
-import net.jini.core.lease.*;
-
-import java.rmi.*;
+import java.rmi.MarshalledObject;
+import java.rmi.RemoteException;
+import net.jini.core.entry.Entry;
+import net.jini.core.entry.UnusableEntryException;
+import net.jini.core.event.EventRegistration;
+import net.jini.core.event.RemoteEventListener;
+import net.jini.core.lease.Lease;
+import net.jini.core.transaction.Transaction;
+import net.jini.core.transaction.TransactionException;
/**
* This interface is implemented by servers that export a
Modified: incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace05.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace05.java?rev=939281&r1=939280&r2=939281&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace05.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/space/JavaSpace05.java Thu Apr 29 11:31:06 2010
@@ -18,17 +18,12 @@
package net.jini.space;
import java.rmi.MarshalledObject;
-import java.rmi.MarshalException;
import java.rmi.RemoteException;
import java.util.Collection;
import java.util.List;
-import net.jini.core.entry.Entry;
-import net.jini.core.entry.UnusableEntryException;
import net.jini.core.event.EventRegistration;
-import net.jini.core.event.RemoteEvent;
import net.jini.core.event.RemoteEventListener;
-import net.jini.core.lease.Lease;
import net.jini.core.transaction.Transaction;
import net.jini.core.transaction.TransactionException;
import net.jini.entry.UnusableEntriesException;