beepcore-java-commits Mailing List for Java BEEP Core (Page 7)
Status: Beta
Brought to you by:
huston
Menu
▾
▴
beepcore-java-commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(22) |
Aug
(1) |
Sep
|
Oct
(16) |
Nov
(60) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(3) |
Feb
|
Mar
(4) |
Apr
(2) |
May
(13) |
Jun
|
Jul
|
Aug
(10) |
Sep
(34) |
Oct
(27) |
Nov
(2) |
Dec
(2) |
| 2003 |
Jan
|
Feb
|
Mar
(3) |
Apr
(15) |
May
(11) |
Jun
(14) |
Jul
(5) |
Aug
(1) |
Sep
(24) |
Oct
(4) |
Nov
(26) |
Dec
(1) |
| 2004 |
Jan
(3) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Huston F. <hu...@us...> - 2002-09-13 14:49:54
|
Update of /cvsroot/beepcore-java/beepcore-java
In directory usw-pr-cvs1:/tmp/cvs-serv2572
Modified Files:
build.xml
Log Message:
fixed depends
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** build.xml 13 Sep 2002 14:40:03 -0000 1.19
--- build.xml 13 Sep 2002 14:49:51 -0000 1.20
***************
*** 156,160 ****
</target>
! <target name="example" depends="example-compile,log4jlog">
<mkdir dir="${release.dir}/lib"/>
<jar jarfile="${release.dir}/lib/${example.jar.name}"
--- 156,160 ----
</target>
! <target name="example" depends="example-compile,log4jlog,14log">
<mkdir dir="${release.dir}/lib"/>
<jar jarfile="${release.dir}/lib/${example.jar.name}"
***************
*** 358,362 ****
</target>
! <target name="log4jlog" depends="init,log4jCheck" if="log4j-present">
<mkdir dir="${example.build.dir}"/>
<javac srcdir="${example.src.dir}/"
--- 358,362 ----
</target>
! <target name="log4jlog" depends="init,core-jar,log4jCheck" if="log4j-present">
<mkdir dir="${example.build.dir}"/>
<javac srcdir="${example.src.dir}/"
***************
*** 373,383 ****
</target>
! <target name="14LoggingCheck">
! <available classname="java.util.loggin.Logger"
! property="14logging-present"
! classpath="${java.class.path}"/>
! </target>
! <target name="14log" depends="init,14LoggingCheck" if="14logging-present">
<mkdir dir="${example.build.dir}"/>
<javac srcdir="${example.src.dir}/"
--- 373,383 ----
</target>
! <target name="14LoggingCheck">
! <available classname="java.util.loggin.Logger"
! property="14logging-present"
! classpath="${java.class.path}"/>
! </target>
! <target name="14log" depends="init,core-jar,14LoggingCheck" if="14logging-present">
<mkdir dir="${example.build.dir}"/>
<javac srcdir="${example.src.dir}/"
|
|
From: Huston F. <hu...@us...> - 2002-09-13 14:40:07
|
Update of /cvsroot/beepcore-java/beepcore-java
In directory usw-pr-cvs1:/tmp/cvs-serv31266
Modified Files:
build.xml
Log Message:
1.4 logging support from Serge Adda
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** build.xml 7 Sep 2002 15:16:32 -0000 1.18
--- build.xml 13 Sep 2002 14:40:03 -0000 1.19
***************
*** 66,72 ****
<javac srcdir="${core.src.dir}/"
destdir="${core.build.dir}"
! debug="${debug}"
! optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/core/*.java"/>
<include name="**/lib/*.java"/>
--- 66,72 ----
<javac srcdir="${core.src.dir}/"
destdir="${core.build.dir}"
! debug="${debug}"
! optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/core/*.java"/>
<include name="**/lib/*.java"/>
***************
*** 373,375 ****
--- 373,395 ----
</target>
+ <target name="14LoggingCheck">
+ <available classname="java.util.loggin.Logger"
+ property="14logging-present"
+ classpath="${java.class.path}"/>
+ </target>
+
+ <target name="14log" depends="init,14LoggingCheck" if="14logging-present">
+ <mkdir dir="${example.build.dir}"/>
+ <javac srcdir="${example.src.dir}/"
+ destdir="${example.build.dir}"
+ debug="${debug}"
+ optimize="${optimize}"
+ deprecation="${deprecation}">
+ <include name="**/util/BeepLogger.java"/>
+ <classpath>
+ <pathelement path="${java.class.path}"/>
+ <pathelement location="${release.dir}/lib/${core.jar.name}"/>
+ </classpath>
+ </javac>
+ </target>
</project>
|
|
From: Huston F. <hu...@us...> - 2002-09-13 14:33:44
|
Update of /cvsroot/beepcore-java/beepcore-java/example/org/beepcore/beep/util
In directory usw-pr-cvs1:/tmp/cvs-serv29192/example/org/beepcore/beep/util
Added Files:
BeepLogger.java
Log Message:
1.4 logging support from Serge Adda
--- NEW FILE: BeepLogger.java ---
package org.beepcore.beep.util;
/*
* BeepLogger.java
*
* Created on August 28, 2002, 5:59 PM
*
* @author Serge Adda
*/
import org.beepcore.beep.util.*;
import java.util.logging.*;
/**
*
* @author sad
*/
public class BeepLogger implements LogService {
private Logger logger_;
/** Creates a new instance of BeepLogger */
public BeepLogger() {
this(Log.SEV_ERROR);
}
/** Creates a new instance of BeepLogger */
public BeepLogger(int severity) {
this(Logger.global, severity);
}
/** Creates a new instance of BeepLogger */
public BeepLogger(Logger logger, int severity) {
logger_ = logger;
setSeverity(severity);
}
private Level beep2j2se(int sev) {
switch (sev) {
case Log.SEV_EMERGENCY:
case Log.SEV_ALERT:
case Log.SEV_CRITICAL:
case Log.SEV_ERROR:
return Level.SEVERE;
case Log.SEV_WARNING:
return Level.WARNING;
case Log.SEV_NOTICE:
case Log.SEV_INFORMATIONAL:
return Level.INFO;
case Log.SEV_DEBUG:
return Level.FINE;
case Log.SEV_DEBUG_VERBOSE:
return Level.ALL;
default:
return Level.ALL;
}
}
/** Used to determine if a message of <code>sev</code> will be logged.
*
*/
public boolean isLogged(int sev) {
return logger_.isLoggable(beep2j2se(sev));
}
/** Used decide if a message of <code>sev</code> will be logged.
*
*/
public void setSeverity(int sev) {
logger_.setLevel(beep2j2se(sev));
}
/** Method logEntry
*
*
* @param sev
* @param service
* @param message
*
*
*/
public void logEntry(int sev, String service, String message) {
logger_.log(beep2j2se(sev), service + ": " + message);
}
/** Method logEntry
*
*
* @param sev
* @param service
* @param exception
*
*
*/
public void logEntry(int sev, String service, Throwable exception) {
logger_.log(beep2j2se(sev), service, exception);
}
}
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:16:34
|
Update of /cvsroot/beepcore-java/beepcore-java
In directory usw-pr-cvs1:/tmp/cvs-serv4099
Modified Files:
build.xml
Log Message:
javadoc fixes
Index: build.xml
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** build.xml 26 Aug 2002 17:53:28 -0000 1.17
--- build.xml 7 Sep 2002 15:16:32 -0000 1.18
***************
*** 53,56 ****
--- 53,63 ----
<target name="init">
<mkdir dir="${core.build.dir}" />
+ <condition property="javadoc.param" value="-breakiterator">
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </or>
+ </condition>
+ <property name="javadoc.param" value="" />
</target>
***************
*** 93,96 ****
--- 100,104 ----
windowtitle="${Name} API"
doctitle="${Name}"
+ additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<classpath>
***************
*** 213,216 ****
--- 221,225 ----
windowtitle="SASL Profile API"
doctitle="SASL Profile"
+ additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<classpath>
***************
*** 228,232 ****
debug="${debug}"
optimize="${optimize}"
! deprecation="${deprecation}">
<include name="**/jsse/*.java"/>
<classpath>
--- 237,241 ----
debug="${debug}"
optimize="${optimize}"
! deprecation="off">
<include name="**/jsse/*.java"/>
<classpath>
***************
*** 254,257 ****
--- 263,267 ----
windowtitle="JSSE TLS Profile API"
doctitle="JSSE TLS Profile"
+ additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<link offline="${doc-ref-offline}"
***************
*** 302,305 ****
--- 312,316 ----
windowtitle="PureTLS TLS Profile API"
doctitle="PureTLS TLS Profile"
+ additionalparam="${javadoc.param}"
bottom="Copyright © 2001 Invisible Worlds, Inc. All Rights Reserved.">
<link offline="${doc-ref-offline}"
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:15:52
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory usw-pr-cvs1:/tmp/cvs-serv3983 Modified Files: BEEPException.java Frame.java Log Message: javadoc fixes Index: BEEPException.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/BEEPException.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** BEEPException.java 7 May 2002 04:57:51 -0000 1.4 --- BEEPException.java 7 Sep 2002 15:15:49 -0000 1.5 *************** *** 2,6 **** * BEEPException.java $Revision$ $Date$ * ! * Copyright (c) 2001 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the --- 2,6 ---- * BEEPException.java $Revision$ $Date$ * ! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the Index: Frame.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Frame.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** Frame.java 7 Sep 2002 14:59:43 -0000 1.17 --- Frame.java 7 Sep 2002 15:15:49 -0000 1.18 *************** *** 1,7 **** /* ! * Frame.java $Revision$ $Date$ * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. ! * Copyright (c) 2001 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the --- 1,7 ---- /* ! * Frame.java $Revision$ $Date$ * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. ! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the |
|
From: Huston F. <hu...@us...> - 2002-09-07 15:13:14
|
Update of /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse
In directory usw-pr-cvs1:/tmp/cvs-serv3476/org/beepcore/beep/profile/tls/jsse
Modified Files:
TLSProfileJSSE.java
Log Message:
javadoc fixes
Index: TLSProfileJSSE.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/tls/org/beepcore/beep/profile/tls/jsse/TLSProfileJSSE.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** TLSProfileJSSE.java 9 Nov 2001 18:41:23 -0000 1.5
--- TLSProfileJSSE.java 7 Sep 2002 15:13:12 -0000 1.6
***************
*** 140,143 ****
--- 140,144 ----
public void handshakeCompleted(HandshakeCompletedEvent event)
{
+ Log.logEntry(Log.SEV_DEBUG, "HandshakeCompleted");
synchronized (handshakeListeners) {
Iterator i = TLSProfileJSSE.handshakeListeners.iterator();
***************
*** 593,596 ****
--- 594,598 ----
if ((data == null)
|| (!data.equals(PROCEED1) &&!data.equals(PROCEED2))) {
+ Log.logEntry(Log.SEV_ERROR, "Invalid reply: " + data);
throw new BEEPException(ERR_EXPECTED_PROCEED);
}
***************
*** 617,621 ****
--- 619,625 ----
l.session = session;
+ Log.logEntry(Log.SEV_DEBUG, "Handshake starting");
newSocket.startHandshake();
+ Log.logEntry(Log.SEV_DEBUG, "Handshake returned");
synchronized (l) {
***************
*** 628,631 ****
--- 632,636 ----
}
}
+ Log.logEntry(Log.SEV_DEBUG, "Handshake done waiting");
} catch (javax.net.ssl.SSLException e) {
Log.logEntry(Log.SEV_ERROR, e);
***************
*** 662,666 ****
* negotiation is complete.
*
- * @return
*/
public static SessionCredential generateCredential()
--- 667,670 ----
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:11:26
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp
In directory usw-pr-cvs1:/tmp/cvs-serv3083
Modified Files:
TCPSession.java
Log Message:
javadoc fixes
Index: TCPSession.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/transport/tcp/TCPSession.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** TCPSession.java 7 May 2002 04:59:23 -0000 1.24
--- TCPSession.java 7 Sep 2002 15:11:22 -0000 1.25
***************
*** 3,7 ****
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 3,7 ----
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 252,256 ****
*
* @param f the Frame to send.
! * @returns boolean true of the frame was sent, false otherwise.
*
* @throws BEEPException
--- 252,256 ----
*
* @param f the Frame to send.
! * @return boolean true of the frame was sent, false otherwise.
*
* @throws BEEPException
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:09:42
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/database
In directory usw-pr-cvs1:/tmp/cvs-serv2630/sasl/otp/database
Modified Files:
UserDatabase.java UserDatabaseImpl.java
Log Message:
javadoc fixes
Index: UserDatabase.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/database/UserDatabase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** UserDatabase.java 8 Nov 2001 05:51:35 -0000 1.2
--- UserDatabase.java 7 Sep 2002 15:09:38 -0000 1.3
***************
*** 42,46 ****
* particular user and OTP database.
*
! * @returns String the algorithm employed by the user of this database
* for SASL OTP authentication.
*
--- 42,46 ----
* particular user and OTP database.
*
! * @return String the algorithm employed by the user of this database
* for SASL OTP authentication.
*
***************
*** 51,55 ****
* Method getLastHash
*
! * @returns byte[] the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash value is represented in binary form.
--- 51,55 ----
* Method getLastHash
*
! * @return byte[] the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash value is represented in binary form.
***************
*** 61,65 ****
* Method getLastHashAsString
*
! * @returns String the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash is represented in hexadecimal form.
--- 61,65 ----
* Method getLastHashAsString
*
! * @return String the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash is represented in hexadecimal form.
***************
*** 71,75 ****
* Method getSeed
*
! * @returns String the seed used by the
* user of this database for SASL OTP authentication.
*
--- 71,75 ----
* Method getSeed
*
! * @return String the seed used by the
* user of this database for SASL OTP authentication.
*
***************
*** 80,84 ****
* Method getSequence
*
! * @returns int the sequence to be used by the
* user of this database for SASL OTP authentication.
*
--- 80,84 ----
* Method getSequence
*
! * @return int the sequence to be used by the
* user of this database for SASL OTP authentication.
*
***************
*** 89,93 ****
* Method getAuthenticator
*
! * @returns String the user of this database.
*
*/
--- 89,93 ----
* Method getAuthenticator
*
! * @return String the user of this database.
*
*/
Index: UserDatabaseImpl.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/sasl/otp/database/UserDatabaseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** UserDatabaseImpl.java 8 Nov 2001 05:51:35 -0000 1.2
--- UserDatabaseImpl.java 7 Sep 2002 15:09:39 -0000 1.3
***************
*** 77,81 ****
* Method getAlgorithmName
*
! * @returns String the algorithm employed by the user of this database
* for SASL OTP authentication.
*
--- 77,81 ----
* Method getAlgorithmName
*
! * @return String the algorithm employed by the user of this database
* for SASL OTP authentication.
*
***************
*** 89,93 ****
* Method getLastHash
*
! * @returns byte[] the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash value is represented in binary form.
--- 89,93 ----
* Method getLastHash
*
! * @return byte[] the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash value is represented in binary form.
***************
*** 102,106 ****
* Method getLastHash
*
! * @returns String the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash is represented in hexadecimal form.
--- 102,106 ----
* Method getLastHash
*
! * @return String the lastHash value generated the last time the
* user of this database performed SASL OTP authentication. The
* hash is represented in hexadecimal form.
***************
*** 115,119 ****
* Method getLastHash
*
! * @returns String the seed used by the
* user of this database for SASL OTP authentication.
*
--- 115,119 ----
* Method getLastHash
*
! * @return String the seed used by the
* user of this database for SASL OTP authentication.
*
***************
*** 127,131 ****
* Method getLastHash
*
! * @returns int the sequence that shoudl be used by the
* user of this database for their next SASL OTP authentication.
*
--- 127,131 ----
* Method getLastHash
*
! * @return int the sequence that should be used by the
* user of this database for their next SASL OTP authentication.
*
***************
*** 139,143 ****
* Method getLastHash
*
! * @returns String the last hash value used by the
* user of this database for SASL OTP authentication.
*
--- 139,143 ----
* Method getLastHash
*
! * @return String the last hash value used by the
* user of this database for SASL OTP authentication.
*
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:09:42
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile
In directory usw-pr-cvs1:/tmp/cvs-serv2630
Modified Files:
Profile.java
Log Message:
javadoc fixes
Index: Profile.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/profile/Profile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Profile.java 8 Nov 2001 05:51:34 -0000 1.3
--- Profile.java 7 Sep 2002 15:09:38 -0000 1.4
***************
*** 1,7 ****
-
/*
! * Profile.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 1,7 ----
/*
! * Profile.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
+ * Copyright (c) 2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 44,49 ****
* @param config
*
! * @returns The corresponding <code>StartChannelListener</code> for
! * the specified uri.
* @throws BEEPException
*/
--- 44,49 ----
* @param config
*
! * @return The corresponding <code>StartChannelListener</code> for
! * the specified uri.
* @throws BEEPException
*/
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:06:49
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1957
Modified Files:
SharedChannel.java
Log Message:
javadoc fixes
Index: SharedChannel.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/SharedChannel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** SharedChannel.java 29 Aug 2002 01:50:42 -0000 1.7
--- SharedChannel.java 7 Sep 2002 15:06:45 -0000 1.8
***************
*** 3,6 ****
--- 3,7 ----
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
+ * Copyright (c) 2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 96,100 ****
* message.
*
! * @see DataStream
* @see MessageStatus
*
--- 97,101 ----
* message.
*
! * @see OutputDataStream
* @see MessageStatus
*
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:06:11
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1836
Modified Files:
ChannelPool.java
Log Message:
javadoc fixes
Index: ChannelPool.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/lib/ChannelPool.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ChannelPool.java 8 Nov 2001 05:51:34 -0000 1.5
--- ChannelPool.java 7 Sep 2002 15:06:07 -0000 1.6
***************
*** 1,7 ****
-
/*
! * ChannelPool.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 1,7 ----
/*
! * ChannelPool.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
+ * Copyright (c) 2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 150,159 ****
* @return A <code>SharedChannel</code>.
*
! * @see DataListener
* @see SharedChannel
*
* @throws BEEPException
*/
! synchronized public SharedChannel getSharedChannel(String profile, MessageListener listener)
throws BEEPException
{
--- 150,160 ----
* @return A <code>SharedChannel</code>.
*
! * @see MessageListener
* @see SharedChannel
*
* @throws BEEPException
*/
! synchronized public SharedChannel
! getSharedChannel(String profile, MessageListener listener)
throws BEEPException
{
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:01:19
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv485
Modified Files:
BEEPError.java
Log Message:
javadoc fixes
Index: BEEPError.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/BEEPError.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** BEEPError.java 29 Nov 2001 04:00:00 -0000 1.6
--- BEEPError.java 7 Sep 2002 15:01:17 -0000 1.7
***************
*** 1,7 ****
-
/*
! * BEEPError.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 1,7 ----
/*
! * BEEPError.java $Revision$ $Date$
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
+ * Copyright (c) 2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 312,316 ****
public static final int CODE_PARAMETER_INVALID = 553;
! /** Transaction failed (e.g. policy violation) */
public static final int CODE_TRANSACTION_FAILED = 554;
}
--- 312,316 ----
public static final int CODE_PARAMETER_INVALID = 553;
! /** Transaction failed (e.g. policy violation). */
public static final int CODE_TRANSACTION_FAILED = 554;
}
|
|
From: Huston F. <hu...@us...> - 2002-09-07 15:00:33
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory usw-pr-cvs1:/tmp/cvs-serv32721 Modified Files: ByteOutputDataStream.java Log Message: javadoc fixes Index: ByteOutputDataStream.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ByteOutputDataStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ByteOutputDataStream.java 10 Nov 2001 21:33:29 -0000 1.1 --- ByteOutputDataStream.java 7 Sep 2002 15:00:30 -0000 1.2 *************** *** 31,35 **** * inconsistent or lost. * ! * @see org.beepcore.beep.core.DataStream * * @author Huston Franklin --- 31,35 ---- * inconsistent or lost. * ! * @see org.beepcore.beep.core.OutputDataStream * * @author Huston Franklin |
|
From: Huston F. <hu...@us...> - 2002-09-07 15:00:14
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv32619
Modified Files:
Channel.java
Log Message:
javadoc fixes
Index: Channel.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Channel.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** Channel.java 6 Sep 2002 02:34:28 -0000 1.28
--- Channel.java 7 Sep 2002 15:00:12 -0000 1.29
***************
*** 137,141 ****
*
* @see org.beepcore.beep.core.Session
! * @see org.beepcore.beep.core.DataListener
*/
protected Channel(String profile, String number, MessageListener listener,
--- 137,141 ----
*
* @see org.beepcore.beep.core.Session
! * @see org.beepcore.beep.core.MessageListener
*/
protected Channel(String profile, String number, MessageListener listener,
***************
*** 311,315 ****
*
* @param ml
! * @returns The previous MessageListener or null if none was set.
*/
public MessageListener setMessageListener(MessageListener ml)
--- 311,315 ----
*
* @param ml
! * @return The previous MessageListener or null if none was set.
*/
public MessageListener setMessageListener(MessageListener ml)
***************
*** 368,372 ****
* to this sendMSG listener.
*
! * @see DataStream
* @see MessageStatus
*
--- 368,372 ----
* to this sendMSG listener.
*
! * @see OutputDataStream
* @see MessageStatus
*
|
|
From: Huston F. <hu...@us...> - 2002-09-07 14:59:46
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory usw-pr-cvs1:/tmp/cvs-serv32394 Modified Files: Frame.java Log Message: javadoc fixes Index: Frame.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Frame.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** Frame.java 27 Nov 2001 17:37:22 -0000 1.16 --- Frame.java 7 Sep 2002 14:59:43 -0000 1.17 *************** *** 41,45 **** * @version $Revision$, $Date$ * - * @see FrameDataStream * @see BufferSegment */ --- 41,44 ---- |
|
From: Huston F. <hu...@us...> - 2002-09-07 14:59:34
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv32347
Modified Files:
InputDataStream.java
Log Message:
javadoc fixes
Index: InputDataStream.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/InputDataStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** InputDataStream.java 15 Jan 2002 16:02:59 -0000 1.3
--- InputDataStream.java 7 Sep 2002 14:59:30 -0000 1.4
***************
*** 2,6 ****
* InputDataStream.java $Revision$ $Date$
*
! * Copyright (c) 2001 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 2,6 ----
* InputDataStream.java $Revision$ $Date$
*
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 114,118 ****
/**
! * @todo doc
*/
public boolean availableSegment() {
--- 114,119 ----
/**
! * Returns <code>true</code> if a <code>BufferSegment</code> is available
! * to receive.
*/
public boolean availableSegment() {
***************
*** 121,125 ****
/**
! * @todo doc
*/
public void close() {
--- 122,127 ----
/**
! * Indicates that the application is finished receiving data from this
! * stream. If there is more data available the data will be discarded.
*/
public void close() {
***************
*** 131,135 ****
/**
! * @todo doc
*/
public InputDataStreamAdapter getInputStream()
--- 133,137 ----
/**
! * Returns an <code>InputStream</code> for reading the data in this stream.
*/
public InputDataStreamAdapter getInputStream()
***************
*** 143,147 ****
/**
! * @todo doc
*/
public BufferSegment getNextSegment() {
--- 145,150 ----
/**
! * Returns the next <code>BufferSegment</code> in this stream.
! *
*/
public BufferSegment getNextSegment() {
***************
*** 163,167 ****
/**
*
! * @returns null if isComplete() is true.
*/
public BufferSegment waitForNextSegment() throws InterruptedException {
--- 166,170 ----
/**
*
! * @return null if isComplete() is true.
*/
public BufferSegment waitForNextSegment() throws InterruptedException {
|
|
From: Huston F. <hu...@us...> - 2002-09-07 14:59:06
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv32286
Modified Files:
ProfileRegistry.java
Log Message:
javadoc fixes
Index: ProfileRegistry.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ProfileRegistry.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** ProfileRegistry.java 29 Nov 2001 04:00:00 -0000 1.11
--- ProfileRegistry.java 7 Sep 2002 14:59:03 -0000 1.12
***************
*** 3,7 ****
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
--- 3,7 ----
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 74,82 ****
/**
! * Method getProfiles
! *
! *
! * @return
! *
*/
public Enumeration getProfiles()
--- 74,78 ----
/**
! * Returns the currently registered profile URIs.
*/
public Enumeration getProfiles()
|
|
From: Huston F. <hu...@us...> - 2002-09-07 14:58:36
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory usw-pr-cvs1:/tmp/cvs-serv32168 Modified Files: ReplyListener.java Log Message: javadoc fixes Index: ReplyListener.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/ReplyListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ReplyListener.java 8 Nov 2001 05:51:34 -0000 1.2 --- ReplyListener.java 7 Sep 2002 14:58:33 -0000 1.3 *************** *** 1,7 **** - /* * ReplyListener.java $Revision$ $Date$ * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the --- 1,7 ---- /* * ReplyListener.java $Revision$ $Date$ * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. + * Copyright (c) 2002 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the *************** *** 26,30 **** * corresponding to an MSG sent with <code>sendMSG</code>. * ! * @see org.beepcore.beep.core.Channel#sendMSG(DataStream, ReplyListener) * * @author Eric Dixon --- 26,30 ---- * corresponding to an MSG sent with <code>sendMSG</code>. * ! * @see org.beepcore.beep.core.Channel#sendMSG(OutputDataStream, ReplyListener) * * @author Eric Dixon |
|
From: Huston F. <hu...@us...> - 2002-09-07 14:58:11
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv32057
Modified Files:
Session.java
Log Message:
javadoc fixes
Index: Session.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Session.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** Session.java 5 Sep 2002 23:03:51 -0000 1.30
--- Session.java 7 Sep 2002 14:58:09 -0000 1.31
***************
*** 3,7 ****
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001 Huston Franklin. All rights reserved.
* Copyright (c) 2002 Kevin Kress. All rights reserved.
*
--- 3,7 ----
*
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved.
* Copyright (c) 2002 Kevin Kress. All rights reserved.
*
***************
*** 244,248 ****
* of future events.
*
! * @see removeChannelListener
*/
public void addChannelListener(ChannelListener l)
--- 244,248 ----
* of future events.
*
! * @see #removeChannelListener
*/
public void addChannelListener(ChannelListener l)
***************
*** 257,261 ****
* of future events.
*
! * @see removeSessionListener
*/
public void addSessionListener(SessionListener l)
--- 257,261 ----
* of future events.
*
! * @see #removeSessionListener
*/
public void addSessionListener(SessionListener l)
***************
*** 399,403 ****
* being dispatched.
*
! * @see addChannelListener
*/
public void removeChannelListener(ChannelListener l)
--- 399,403 ----
* being dispatched.
*
! * @see #addChannelListener
*/
public void removeChannelListener(ChannelListener l)
***************
*** 414,418 ****
* being dispatched.
*
! * @see addSessionListener
*/
public void removeSessionListener(SessionListener l)
--- 414,418 ----
* being dispatched.
*
! * @see #addSessionListener
*/
public void removeSessionListener(SessionListener l)
***************
*** 818,825 ****
* two-thirds of the socket's receiveBufferSize. If a size is requested
* beyond that, an exception is thrown.
- * @channel indicates the Channel this flow-control message is for.
- * @ackno is the number of bytes we've received on this Channel.
- * @newSize is the number of bytes we're able to read at this point in
- * time.
*
*
--- 818,821 ----
|
|
From: Huston F. <hu...@us...> - 2002-09-07 14:57:41
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core In directory usw-pr-cvs1:/tmp/cvs-serv31927 Modified Files: StringOutputDataStream.java Log Message: javadoc fixes Index: StringOutputDataStream.java =================================================================== RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/StringOutputDataStream.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** StringOutputDataStream.java 10 Nov 2001 21:33:29 -0000 1.1 --- StringOutputDataStream.java 7 Sep 2002 14:57:37 -0000 1.2 *************** *** 3,7 **** * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. ! * Copyright (c) 2001 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the --- 3,7 ---- * * Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved. ! * Copyright (c) 2001,2002 Huston Franklin. All rights reserved. * * The contents of this file are subject to the Blocks Public License (the *************** *** 37,41 **** * inconsistent or lost. * ! * @see org.beepcore.beep.core.DataStream * * @author Eric Dixon --- 37,41 ---- * inconsistent or lost. * ! * @see org.beepcore.beep.core.OutputDataStream * * @author Eric Dixon |
|
From: Huston F. <hu...@us...> - 2002-09-06 02:34:31
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv3840/src/org/beepcore/beep/core
Modified Files:
Channel.java
Log Message:
changed visibility to allow for non-tuning profiles to reply to piggyback'd data.
Index: Channel.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Channel.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** Channel.java 4 Sep 2002 14:42:50 -0000 1.27
--- Channel.java 6 Sep 2002 02:34:28 -0000 1.28
***************
*** 1056,1060 ****
* called by Channel Zero
*/
! void setStartData(String data)
{
startData = data;
--- 1056,1060 ----
* called by Channel Zero
*/
! public void setStartData(String data)
{
startData = data;
|
|
From: Kevin K. <ki...@us...> - 2002-09-05 23:03:55
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv27687
Modified Files:
Session.java
Log Message:
Fix for bug 589436. Greeting will now timeout.
Index: Session.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Session.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** Session.java 22 Aug 2002 18:09:34 -0000 1.29
--- Session.java 5 Sep 2002 23:03:51 -0000 1.30
***************
*** 4,7 ****
--- 4,8 ----
* Copyright (c) 2001 Invisible Worlds, Inc. All rights reserved.
* Copyright (c) 2001 Huston Franklin. All rights reserved.
+ * Copyright (c) 2002 Kevin Kress. All rights reserved.
*
* The contents of this file are subject to the Blocks Public License (the
***************
*** 197,201 ****
//zero.wait(MAX_START_CHANNEL_INTERVAL);
! greetingListener.wait(0);
waitCount += MAX_START_CHANNEL_INTERVAL;
--- 198,202 ----
//zero.wait(MAX_START_CHANNEL_INTERVAL);
! greetingListener.wait(MAX_START_CHANNEL_INTERVAL);
waitCount += MAX_START_CHANNEL_INTERVAL;
|
|
From: Huston F. <hu...@us...> - 2002-09-04 14:42:54
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv2021/src/org/beepcore/beep/core
Modified Files:
Channel.java
Log Message:
making send async
Index: Channel.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Channel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Channel.java 2 Sep 2002 13:44:39 -0000 1.26
--- Channel.java 4 Sep 2002 14:42:50 -0000 1.27
***************
*** 891,906 ****
// make sure the other peer can accept something
if (peerWindowSize == 0) {
! try {
! wait();
! } catch (InterruptedException e) {
! throw new RuntimeException("caught InterruptedException");
! }
!
! // wait until there is something to send up to
! // our timeout
! if (peerWindowSize == 0) {
! throw new BEEPException("Time expired waiting " +
! "for peer.");
! }
}
--- 891,895 ----
// make sure the other peer can accept something
if (peerWindowSize == 0) {
! return;
}
***************
*** 1010,1014 ****
if ((previousPeerWindowSize == 0) && (peerWindowSize > 0)) {
! notify(); // unblock if we're waiting to send
}
}
--- 999,1006 ----
if ((previousPeerWindowSize == 0) && (peerWindowSize > 0)) {
! try {
! sendQueuedMessages();
! } catch (BEEPException e) {
! }
}
}
|
|
From: Huston F. <hu...@us...> - 2002-09-02 13:47:16
|
Update of /cvsroot/beepcore-java/beepcore-java/test/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv30966/test/org/beepcore/beep/core
Modified Files:
TestByteOutputDataStream.java
Log Message:
cleanup
Index: TestByteOutputDataStream.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/test/org/beepcore/beep/core/TestByteOutputDataStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TestByteOutputDataStream.java 10 Nov 2001 21:33:29 -0000 1.1
--- TestByteOutputDataStream.java 2 Sep 2002 13:47:12 -0000 1.2
***************
*** 63,68 ****
protected void setUp() throws UnsupportedEncodingException, BEEPException {
- Channel channel = new Channel("0", "0", null, null);
-
String s = "12345678901234567890x2345678901234567890";
--- 63,66 ----
|
|
From: Huston F. <hu...@us...> - 2002-09-02 13:44:48
|
Update of /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core
In directory usw-pr-cvs1:/tmp/cvs-serv30231/src/org/beepcore/beep/core
Modified Files:
Channel.java OutputDataStream.java
Log Message:
Changed to allow adding data to OutputDataStream after the message has been queued for sending.
Index: Channel.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/Channel.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Channel.java 20 Aug 2002 03:08:58 -0000 1.25
--- Channel.java 2 Sep 2002 13:44:39 -0000 1.26
***************
*** 845,852 ****
pendingSendMessages.add(status);
}
sendQueuedMessages();
}
! private synchronized void sendQueuedMessages() throws BEEPException
{
while (true) {
--- 845,853 ----
pendingSendMessages.add(status);
}
+ status.getMessageData().setChannel(this);
sendQueuedMessages();
}
! synchronized void sendQueuedMessages() throws BEEPException
{
while (true) {
Index: OutputDataStream.java
===================================================================
RCS file: /cvsroot/beepcore-java/beepcore-java/src/org/beepcore/beep/core/OutputDataStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** OutputDataStream.java 28 May 2002 02:23:37 -0000 1.3
--- OutputDataStream.java 2 Sep 2002 13:44:42 -0000 1.4
***************
*** 69,72 ****
--- 69,78 ----
public void add(BufferSegment segment) {
this.buffers.addLast(segment);
+ if (channel != null) {
+ try {
+ channel.sendQueuedMessages();
+ } catch (BEEPException e) {
+ }
+ }
}
***************
*** 89,92 ****
--- 95,104 ----
public void setComplete() {
this.complete = true;
+ if (channel != null) {
+ try {
+ channel.sendQueuedMessages();
+ } catch (BEEPException e) {
+ }
+ }
}
***************
*** 123,126 ****
--- 135,142 ----
return b;
}
+
+ void setChannel(Channel channel) {
+ this.channel = channel;
+ }
protected final MimeHeaders mimeHeaders;
***************
*** 130,132 ****
--- 146,149 ----
private boolean headersSent = false;
private int curOffset = 0;
+ private Channel channel = null;
}
|
