You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/08/19 16:58:12 UTC
svn commit: r1515455 - in /qpid/proton/trunk:
proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/
proton-j/ proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/
proton-j/proton-api/src/main/java/org/apache/qpid/proton/lo...
Author: philharveyonline
Date: Mon Aug 19 14:58:11 2013
New Revision: 1515455
URL: http://svn.apache.org/r1515455
Log:
PROTON-343: Removed proton-logging module and its usages (all of which are functionally insignificant),
so that the upcoming Proton 0.5 release does not contain this not-yet-prime-time module.
Removed:
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineLogger.java
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/logging/
qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/
qpid/proton/trunk/proton-j/proton-logging/
qpid/proton/trunk/proton-j/proton/src/test/java/org/apache/qpid/proton/engine/impl/EngineFactoryImplTest.java
qpid/proton/trunk/tests/java/org/apache/qpid/proton/systemtests/logging/
Modified:
qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java
qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
qpid/proton/trunk/proton-j/pom.xml
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java
qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EngineFactoryImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java (original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java Mon Aug 19 14:58:11 2013
@@ -34,7 +34,6 @@ import org.apache.qpid.proton.codec.jni.
import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.Delivery;
import org.apache.qpid.proton.engine.EndpointState;
-import org.apache.qpid.proton.engine.EngineLogger;
import org.apache.qpid.proton.engine.Link;
import org.apache.qpid.proton.engine.Session;
import org.apache.qpid.proton.jni.Proton;
@@ -308,15 +307,4 @@ public class JNIConnection implements Co
{
throw new ProtonUnsupportedOperationException();
}
-
- public EngineLogger getEngineLogger()
- {
- //TODO: implement
- return null;
- }
-
- public void setEngineLogger(EngineLogger engineLogger)
- {
- //TODO: implement
- }
}
Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java (original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java Mon Aug 19 14:58:11 2013
@@ -21,7 +21,6 @@ package org.apache.qpid.proton.engine.jn
import org.apache.qpid.proton.ProtonCEquivalent;
import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.EngineFactory;
-import org.apache.qpid.proton.engine.EngineLogger;
import org.apache.qpid.proton.engine.SslDomain;
import org.apache.qpid.proton.engine.SslPeerDetails;
import org.apache.qpid.proton.engine.Transport;
@@ -67,15 +66,4 @@ public class JNIEngineFactory extends JN
}
};
}
-
- public EngineLogger getEngineLogger()
- {
- //TODO: implement
- return null;
- }
-
- public void setEngineLogger(EngineLogger engineLogger)
- {
- //TODO: implement
- }
}
Modified: qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java (original)
+++ qpid/proton/trunk/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java Mon Aug 19 14:58:11 2013
@@ -471,15 +471,4 @@ public class JNITransport implements Tra
free();
super.finalize();
}
-
- public EngineLogger getEngineLogger()
- {
- //TODO: implement
- return null;
- }
-
- public void setEngineLogger(EngineLogger engineLogger)
- {
- //TODO: implement
- }
}
Modified: qpid/proton/trunk/proton-j/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/pom.xml?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/pom.xml (original)
+++ qpid/proton/trunk/proton-j/pom.xml Mon Aug 19 14:58:11 2013
@@ -44,7 +44,6 @@
<modules>
<module>proton-api</module>
- <module>proton-logging</module>
<module>proton</module>
<module>contrib/proton-jms</module>
<module>contrib/proton-hawtdispatch</module>
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Connection.java Mon Aug 19 14:58:11 2013
@@ -96,9 +96,6 @@ public interface Connection extends Endp
void setProperties(Map<Symbol,Object> properties);
- EngineLogger getEngineLogger();
- void setEngineLogger(EngineLogger engineLogger);
-
Object getContext();
void setContext(Object context);
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java Mon Aug 19 14:58:11 2013
@@ -26,11 +26,4 @@ public interface EngineFactory extends P
Transport createTransport();
SslDomain createSslDomain();
SslPeerDetails createSslPeerDetails(String hostname, int port);
-
- /**
- * Sets the engine logger used by all Engine objects subsequently
- * created by this factory.
- */
- void setEngineLogger(EngineLogger logger);
- EngineLogger getEngineLogger();
}
Modified: qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Transport.java Mon Aug 19 14:58:11 2013
@@ -186,7 +186,4 @@ public interface Transport extends Endpo
void setMaxFrameSize(int size);
int getRemoteMaxFrameSize();
-
- EngineLogger getEngineLogger();
- void setEngineLogger(EngineLogger engineLogger);
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java Mon Aug 19 14:58:11 2013
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.engine.*;
-import org.apache.qpid.proton.logging.ProtonLogger;
import org.apache.qpid.proton.amqp.transport.Open;
public class ConnectionImpl extends EndpointImpl implements ProtonJConnection
@@ -64,25 +63,16 @@ public class ConnectionImpl extends Endp
private Map<Symbol, Object> _properties;
private Map<Symbol, Object> _remoteProperties;
- private EngineLogger _engineLogger;
-
private Object _context;
private static final Symbol[] EMPTY_SYMBOL_ARRAY = new Symbol[0];
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
- * Intended to only be used by tests.
* Client code outside this module should use a {@link EngineFactory} instead
*/
@Deprecated public ConnectionImpl()
{
- _engineLogger = new ProtonLogger();
- }
-
- ConnectionImpl(EngineLogger engineLogger)
- {
- _engineLogger = engineLogger;
}
public SessionImpl session()
@@ -526,17 +516,6 @@ public class ConnectionImpl extends Endp
}
}
- @Override
- public EngineLogger getEngineLogger()
- {
- return _engineLogger;
- }
-
- public void setEngineLogger(EngineLogger engineLogger)
- {
- _engineLogger = engineLogger;
- }
-
public Object getContext()
{
return _context;
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EngineFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EngineFactoryImpl.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EngineFactoryImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/EngineFactoryImpl.java Mon Aug 19 14:58:11 2013
@@ -20,31 +20,27 @@ package org.apache.qpid.proton.engine.im
import org.apache.qpid.proton.ProtonFactoryImpl;
import org.apache.qpid.proton.engine.EngineFactory;
-import org.apache.qpid.proton.engine.EngineLogger;
import org.apache.qpid.proton.engine.ProtonJConnection;
import org.apache.qpid.proton.engine.ProtonJSslDomain;
import org.apache.qpid.proton.engine.ProtonJSslPeerDetails;
import org.apache.qpid.proton.engine.ProtonJTransport;
import org.apache.qpid.proton.engine.impl.ssl.SslDomainImpl;
import org.apache.qpid.proton.engine.impl.ssl.SslPeerDetailsImpl;
-import org.apache.qpid.proton.logging.ProtonLogger;
public class EngineFactoryImpl extends ProtonFactoryImpl implements EngineFactory
{
- private EngineLogger _logger = new ProtonLogger();
-
@SuppressWarnings("deprecation") // TODO remove once the constructor is made non-public (and therefore non-deprecated)
@Override
public ProtonJConnection createConnection()
{
- return new ConnectionImpl(_logger);
+ return new ConnectionImpl();
}
@SuppressWarnings("deprecation") // TODO remove once the constructor is made non-public (and therefore non-deprecated)
@Override
public ProtonJTransport createTransport()
{
- return new TransportImpl(_logger);
+ return new TransportImpl();
}
@SuppressWarnings("deprecation") // TODO remove once the constructor is made non-public (and therefore non-deprecated)
@@ -60,20 +56,4 @@ public class EngineFactoryImpl extends P
{
return new SslPeerDetailsImpl(hostname, port);
}
-
- @Override
- public void setEngineLogger(EngineLogger logger)
- {
- if(logger == null)
- {
- throw new NullPointerException();
- }
- _logger = logger;
- }
-
- @Override
- public EngineLogger getEngineLogger()
- {
- return _logger;
- }
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ProtocolTracer.java Mon Aug 19 14:58:11 2013
@@ -20,15 +20,11 @@
*/
package org.apache.qpid.proton.engine.impl;
-import org.apache.qpid.proton.engine.EngineLogger;
import org.apache.qpid.proton.framing.TransportFrame;
/**
* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- *
- * @deprecated superseded by {@link EngineLogger}. TODO replace uses of this class with an EngineLogger instead.
*/
-@Deprecated
public interface ProtocolTracer
{
public void receivedFrame(TransportFrame transportFrame);
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportFactoryImpl.java Mon Aug 19 14:58:11 2013
@@ -33,7 +33,7 @@ class TransportFactoryImpl extends Trans
@SuppressWarnings("deprecation") // TODO remove once the constructor is made non-public (and therefore non-deprecated)
public Transport transport(Connection c)
{
- TransportImpl t = new TransportImpl(c.getEngineLogger());
+ TransportImpl t = new TransportImpl();
t.bind(c);
return t;
}
Modified: qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1515455&r1=1515454&r2=1515455&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java (original)
+++ qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/TransportImpl.java Mon Aug 19 14:58:11 2013
@@ -48,7 +48,6 @@ import org.apache.qpid.proton.codec.Writ
import org.apache.qpid.proton.engine.Connection;
import org.apache.qpid.proton.engine.EndpointState;
import org.apache.qpid.proton.engine.EngineFactory;
-import org.apache.qpid.proton.engine.EngineLogger;
import org.apache.qpid.proton.engine.ProtonJTransport;
import org.apache.qpid.proton.engine.Sasl;
import org.apache.qpid.proton.engine.Ssl;
@@ -61,7 +60,6 @@ import org.apache.qpid.proton.engine.Tra
import org.apache.qpid.proton.engine.impl.ssl.ProtonSslEngineProvider;
import org.apache.qpid.proton.engine.impl.ssl.SslImpl;
import org.apache.qpid.proton.framing.TransportFrame;
-import org.apache.qpid.proton.logging.ProtonLogger;
public class TransportImpl extends EndpointImpl
implements ProtonJTransport, FrameBody.FrameBodyHandler<Integer>,
@@ -107,17 +105,15 @@ public class TransportImpl extends Endpo
private boolean _init;
- private EngineLogger _engineLogger;
-
private FrameHandler _frameHandler = this;
/**
* @deprecated This constructor's visibility will be reduced to the default scope in a future release.
* Client code outside this module should use a {@link EngineFactory} instead
*/
- @Deprecated public TransportImpl(EngineLogger engineLogger)
+ @Deprecated public TransportImpl()
{
- this(engineLogger, DEFAULT_MAX_FRAME_SIZE);
+ this(DEFAULT_MAX_FRAME_SIZE);
}
@@ -125,11 +121,10 @@ public class TransportImpl extends Endpo
* Creates a transport with the given maximum frame size.
* Note that the maximumFrameSize also determines the size of the output buffer.
*/
- TransportImpl(EngineLogger engineLogger, int maxFrameSize)
+ TransportImpl(int maxFrameSize)
{
AMQPDefinedTypes.registerAllTypes(_decoder, _encoder);
- _engineLogger = engineLogger;
_maxFrameSize = maxFrameSize;
_frameWriter = new FrameWriter(_encoder, _remoteMaxFrameSize,
FrameWriter.AMQP_FRAME_TYPE,
@@ -137,22 +132,6 @@ public class TransportImpl extends Endpo
}
- /**
- * This constructor is intended to only be used by tests because it uses a hard-coded logger implementation
- */
- TransportImpl()
- {
- this(new ProtonLogger());
- }
-
- /**
- * This constructor is intended to only be used by tests because it uses a hard-coded logger implementation
- */
- TransportImpl(int maxFrameSize)
- {
- this(new ProtonLogger(), maxFrameSize);
- }
-
private void init()
{
if(!_init)
@@ -1289,18 +1268,6 @@ public class TransportImpl extends Endpo
}
}
- @Override
- public EngineLogger getEngineLogger()
- {
- return _engineLogger;
- }
-
- @Override
- public void setEngineLogger(EngineLogger engineLogger)
- {
- _engineLogger = engineLogger;
- }
-
/**
* Override the default frame handler. Must be called before the transport starts being used
* (e.g. {@link #getInputBuffer()}, {@link #getOutputBuffer()}, {@link #ssl(SslDomain)} etc).
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org