JBoss Remoting SVN: r4724 - remoting2/branches/2.x/lib/jbossweb.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-20 01:28:14 -0500 (Thu, 20 Nov 2008)
New Revision: 4724
Added:
remoting2/branches/2.x/lib/jbossweb/README
Modified:
remoting2/branches/2.x/lib/jbossweb/jbossweb.jar
Log:
JBREM-1067: Change version of jbossweb.jar to conform with AS 5.0.0.GA.
Added: remoting2/branches/2.x/lib/jbossweb/README
===================================================================
--- remoting2/branches/2.x/lib/jbossweb/README (rev 0)
+++ remoting2/branches/2.x/lib/jbossweb/README 2008-11-20 06:28:14 UTC (rev 4724)
@@ -0,0 +1,3 @@
+File Version From
+------- ------- ----
+jbossweb.jar 2.1.1.GA http://repository.jboss.com/maven2/jboss/web/jbossweb/2.1.1.GA/
Modified: remoting2/branches/2.x/lib/jbossweb/jbossweb.jar
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Remoting SVN: r4723 - remoting2/branches/2.x/lib/jboss.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-20 01:27:40 -0500 (Thu, 20 Nov 2008)
New Revision: 4723
Modified:
remoting2/branches/2.x/lib/jboss/README
remoting2/branches/2.x/lib/jboss/jboss-common-core.jar
remoting2/branches/2.x/lib/jboss/jboss-j2se.jar
remoting2/branches/2.x/lib/jboss/jboss-jmx.jar
remoting2/branches/2.x/lib/jboss/jnpserver.jar
Log:
JBREM-1067: Change versions of jboss-common-core.jar, jboss-j2se.jar, jboss-jmx.jar, jnpserver.jar to conform with AS 5.0.0.GA.
Modified: remoting2/branches/2.x/lib/jboss/README
===================================================================
--- remoting2/branches/2.x/lib/jboss/README 2008-11-20 06:26:39 UTC (rev 4722)
+++ remoting2/branches/2.x/lib/jboss/README 2008-11-20 06:27:40 UTC (rev 4723)
@@ -1,6 +1,18 @@
The jars included in this directory are from the JBossAS sub-projects and are needed by JBossRemoting.
-The files currently listed are from a build of jboss-as-parent from 0/4/08, shortly before the release of AS 5.0.0.CR2.
+The files currently listed are from a build of jboss-as-parent from 11/19/08, shortly before the release of AS 5.0.0.GA.
+File Version From
+------- ------- ----
+jboss-common-core.jar 2.2.10.GA http://repository.jboss.com/maven2/org/jboss/jboss-common-core/2.2.10.GA/
+jboss-j2se.jar 5.0.0.GA built from jboss-as-parent 11/19/08
+jboss-jmx.jar 5.0.0.GA built from jboss-as-parent 11/19/08
+jboss-logging-log4j.jar 2.0.5.GA http://repository.jboss.com/maven2/org/jboss/logging/jboss-logging-log4j/...
+jboss-logging-spi.jar 2.0.5.GA http://repository.jboss.com/maven2/org/jboss/logging/jboss-logging-spi/2....
+jboss-serialization.jar 1.0.3.GA http://repository.jboss.com/maven2/jboss/jboss-serialization/1.0.3.GA/
+jnpserver.jar 5.0.0.GA http://repository.jboss.com/maven2/org/jboss/naming/jnpserver/5.0.0.GA/
+
+
+
Only exception to this is the jrunit.jar. There is no release of this currently, so having to use locally built version.
However, can reproduce the binary using the appropriate CVS tag from the jrunit project.
Modified: remoting2/branches/2.x/lib/jboss/jboss-common-core.jar
===================================================================
(Binary files differ)
Modified: remoting2/branches/2.x/lib/jboss/jboss-j2se.jar
===================================================================
(Binary files differ)
Modified: remoting2/branches/2.x/lib/jboss/jboss-jmx.jar
===================================================================
(Binary files differ)
Modified: remoting2/branches/2.x/lib/jboss/jnpserver.jar
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Remoting SVN: r4722 - remoting2/branches/2.x/lib/apache-log4j/lib.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-20 01:26:39 -0500 (Thu, 20 Nov 2008)
New Revision: 4722
Modified:
remoting2/branches/2.x/lib/apache-log4j/lib/README
remoting2/branches/2.x/lib/apache-log4j/lib/log4j.jar
Log:
JBREM-1067: Change version of log4j.jar to conform with AS 5.0.0.GA.
Modified: remoting2/branches/2.x/lib/apache-log4j/lib/README
===================================================================
--- remoting2/branches/2.x/lib/apache-log4j/lib/README 2008-11-20 06:25:59 UTC (rev 4721)
+++ remoting2/branches/2.x/lib/apache-log4j/lib/README 2008-11-20 06:26:39 UTC (rev 4722)
@@ -1,3 +1,5 @@
This is a list of the files and versions in this directory. Please keep it up to date:
-log4j.jar - Apache log4j 1.2.15
+File Version From
+------- ------- ----
+log4j.jar 1.2.14 http://repository.jboss.com/maven2/apache-log4j/log4j/1.2.14/
Modified: remoting2/branches/2.x/lib/apache-log4j/lib/log4j.jar
===================================================================
(Binary files differ)
16 years, 1 month
JBoss Remoting SVN: r4721 - remoting2/branches/2.x/lib/apache-commons/lib.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-20 01:25:59 -0500 (Thu, 20 Nov 2008)
New Revision: 4721
Added:
remoting2/branches/2.x/lib/apache-commons/lib/commons-logging.jar
Removed:
remoting2/branches/2.x/lib/apache-commons/lib/commons-httpclient.jar
remoting2/branches/2.x/lib/apache-commons/lib/commons-logging-api.jar
Log:
JBREM-1067: (1) Removed commons-httpclient.jar and (2) replaced commons-logging-api.jar with commons-logging.jar.
Deleted: remoting2/branches/2.x/lib/apache-commons/lib/commons-httpclient.jar
===================================================================
(Binary files differ)
Deleted: remoting2/branches/2.x/lib/apache-commons/lib/commons-logging-api.jar
===================================================================
(Binary files differ)
Added: remoting2/branches/2.x/lib/apache-commons/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: remoting2/branches/2.x/lib/apache-commons/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 1 month
JBoss Remoting SVN: r4720 - remoting2/branches/2.x/lib/apache-commons.
by jboss-remoting-commits＠lists.jboss.org
Author: ron.sigal(a)jboss.com
Date: 2008-11-20 01:24:48 -0500 (Thu, 20 Nov 2008)
New Revision: 4720
Modified:
remoting2/branches/2.x/lib/apache-commons/README.txt
Log:
JBREM-1067: Corrected README file.
Modified: remoting2/branches/2.x/lib/apache-commons/README.txt
===================================================================
--- remoting2/branches/2.x/lib/apache-commons/README.txt 2008-11-20 04:22:42 UTC (rev 4719)
+++ remoting2/branches/2.x/lib/apache-commons/README.txt 2008-11-20 06:24:48 UTC (rev 4720)
@@ -1,14 +1,5 @@
-This is a list of the files and versions in this directory. Please keep it up
-to date:
+This is a list of the files and versions in this directory. Please keep it up to date:
-commons-collections.jar: The 2,1 release of commons-collections obtained from
-http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections/v2.1/
-
-commons-logging.jar: The 1.0.2 release of the commons logging wrapper from
-http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging/v1.0.2/
-
-commons-httpclient.jar: The 2.0 release of the commons http client from
-http://www.apache.org/dist/jakarta/commons/httpclient/binary/commons-httpclient-2.0.zip
-
-commons-vfs.jar: The 1.0-dev release of the commons vfs library obtained from
-http://cvs.apache.org/builds/jakarta-commons/nightly/commons-vfs/
\ No newline at end of file
+File Version From
+------- ------- ----
+commons-logging.jar 1.1.0.jboss http://repository.jboss.com/maven2/apache-logging/commons-logging/1.1.0.j...
16 years, 1 month
JBoss Remoting SVN: r4719 - remoting3/trunk.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-11-19 23:22:42 -0500 (Wed, 19 Nov 2008)
New Revision: 4719
Modified:
remoting3/trunk/build.xml
Log:
JBREM-1063, JBREM-1062 - add javadoc zip, add source jars, add dist target
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-11-20 03:06:04 UTC (rev 4718)
+++ remoting3/trunk/build.xml 2008-11-20 04:22:42 UTC (rev 4719)
@@ -1002,9 +1002,38 @@
<zipfileset dir="transporter/target/main/classes">
<include name="**/*.class"/>
</zipfileset>
+ <zipfileset dir="version/target/main/classes">
+ <include name="**/*.class"/>
+ </zipfileset>
</jar>
</target>
+ <target name="api-source-jar" description="Build the API source JAR" depends="api,transporter,version">
+ <delete file="jboss-remoting-api-source.jar"/>
+ <jar jarfile="jboss-remoting-api-source.jar">
+ <manifest>
+ <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
+ <attribute name="Specification-Title" value="JBoss Remoting Source"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
+ <attribute name="Implementation-Title" value="JBoss Remoting Source (API)"/>
+ <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
+ <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
+ </manifest>
+ <zipfileset dir="api/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="transporter/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="version/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ </jar>
+ </target>
+
<target name="core-jar" description="Build the Core JAR" depends="core,version">
<delete file="jboss-remoting-core.jar"/>
<jar jarfile="jboss-remoting-core.jar">
@@ -1022,8 +1051,25 @@
<zipfileset dir="core/target/main/classes">
<include name="**/*.class"/>
</zipfileset>
- <zipfileset dir="version/target/main/classes">
- <include name="**/*.class"/>
+ </jar>
+ </target>
+
+ <target name="core-source-jar" description="Build the Core source JAR" depends="core,version">
+ <delete file="jboss-remoting-core-source.jar"/>
+ <jar jarfile="jboss-remoting-core-source.jar">
+ <manifest>
+ <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
+ <attribute name="Specification-Title" value="JBoss Remoting Source"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
+ <attribute name="Implementation-Title" value="JBoss Remoting Source (Core)"/>
+ <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
+ <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
+ </manifest>
+ <zipfileset dir="core/src/main/java">
+ <include name="**/*.java"/>
</zipfileset>
</jar>
</target>
@@ -1054,14 +1100,49 @@
<zipfileset dir="transporter/target/main/classes">
<include name="**/*.class"/>
</zipfileset>
+ <zipfileset dir="version/target/main/classes">
+ <include name="**/*.class"/>
+ </zipfileset>
</jar>
</target>
+ <target name="standalone-source-jar" description="Build the standalone source JAR" depends="api,core,standalone,transporter,version">
+ <delete file="jboss-remoting-standalone-source.jar"/>
+ <jar jarfile="jboss-remoting-standalone-source.jar">
+ <manifest>
+ <attribute name="Created-By" value="${java.vm.version} (${java.vm.vendor})"/>
+ <attribute name="Specification-Title" value="JBoss Remoting Source"/>
+ <attribute name="Specification-Version" value="${version}"/>
+ <attribute name="Specification-Vendor" value="JBoss (http://www.jboss.org/)"/>
+ <attribute name="Implementation-Title" value="JBoss Remoting Source - Standalone Version"/>
+ <attribute name="Implementation-URL" value="http://labs.jboss.org/jbossremoting/"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="JBoss, a division of Red Hat, Inc."/>
+ <attribute name="Implementation-Vendor-Id" value="http://www.jboss.org"/>
+ </manifest>
+ <zipfileset dir="api/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="core/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="standalone/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="transporter/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ <zipfileset dir="version/src/main/java">
+ <include name="**/*.java"/>
+ </zipfileset>
+ </jar>
+ </target>
+
<!-- ============================================== -->
<!-- JAVADOCS -->
<!-- ============================================== -->
- <target name="api-javadoc" depends="api,core,standalone,transporter,lib.apiviz,lib.marshalling-api,lib.xnio-api">
+ <target name="api-javadoc" description="Build the API JavaDoc" depends="api,core,standalone,transporter,lib.apiviz,lib.marshalling-api,lib.xnio-api">
<delete dir="api/target/main/docs"/>
<mkdir dir="api/target/main/docs"/>
<javadoc destdir="api/target/main/docs" author="false" version="false" use="false" windowtitle="JBoss Remoting API">
@@ -1069,7 +1150,9 @@
<packageset dir="api/src/main/java"/>
<packageset dir="standalone/src/main/java"/>
<packageset dir="transporter/src/main/java"/>
- <doctitle><![CDATA[<h1>JBoss Remoting 3</h1>]]></doctitle>
+ <doctitle><![CDATA[<h1>JBoss Remoting, version ${version}</h1>]]></doctitle>
+ <header><![CDATA[JBoss Remoting ${version}]]></header>
+ <footer><![CDATA[JBoss Remoting ${version}]]></footer>
<bottom><![CDATA[<i>Copyright © 2008 JBoss, a division of Red Hat, Inc.</i>]]></bottom>
<link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
<link href="http://docs.jboss.org/xnio/${lib.xnio.version-javadoc}/api/"/>
@@ -1083,6 +1166,38 @@
</javadoc>
</target>
+ <target name="api-javadoc-zip" description="Build the API JavaDoc ZIP" depends="api-javadoc">
+ <delete file="jboss-remoting-javadoc.zip"/>
+ <zip zipfile="jboss-remoting-javadoc.zip">
+ <zipfileset dir="api/target/main/docs" prefix="api">
+ <include name="**/*.html"/>
+ <include name="**/*.gif"/>
+ <include name="**/*.png"/>
+ <include name="**/package-list"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <!-- ============================================== -->
+ <!-- Distribution target -->
+ <!-- ============================================== -->
+
+ <target name="dist" description="Build distribution zip file" depends="api-jar,api-source-jar,api-javadoc-zip,core-jar,core-source-jar,standalone-jar,standalone-source-jar">
+ <delete file="jboss-remoting.zip"/>
+ <zip zipfile="jboss-remoting.zip">
+ <zipfileset dir="${basedir}">
+ <include name="COPYING.txt"/>
+ <include name="jboss-remoting-api.jar"/>
+ <include name="jboss-remoting-api-source.jar"/>
+ <include name="jboss-remoting-core.jar"/>
+ <include name="jboss-remoting-core-source.jar"/>
+ <include name="jboss-remoting-standalone.jar"/>
+ <include name="jboss-remoting-standalone-source.jar"/>
+ <include name="jboss-remoting-javadoc.zip"/>
+ </zipfileset>
+ </zip>
+ </target>
+
<!-- Default targets - keep depends in alpha order by category name -->
<!-- These targets should explicitly list all modules, even if they will be built by other modules -->
16 years, 1 month
JBoss Remoting SVN: r4718 - remoting3/trunk.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-11-19 22:06:04 -0500 (Wed, 19 Nov 2008)
New Revision: 4718
Modified:
remoting3/trunk/build.xml
Log:
Clean up some redundancy
Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml 2008-11-20 02:42:59 UTC (rev 4717)
+++ remoting3/trunk/build.xml 2008-11-20 03:06:04 UTC (rev 4718)
@@ -281,8 +281,6 @@
<path refid="api.classpath"/>
<path refid="testing-support.classpath"/>
<pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="api/target/test/.lastcompile" verbose="false"/>
@@ -306,8 +304,6 @@
<path refid="testing-support.classpath"/>
<pathelement location="api/target/test/classes"/>
<pathelement location="${lib.junit.local}"/>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
<batchtest fork="yes" todir="api/target/test-results"
haltonfailure="no">
@@ -568,8 +564,6 @@
<classpath>
<path refid="api.classpath"/>
<path refid="core.classpath"/>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="protocol/multiplex/target/main/.lastcompile" verbose="false"/>
@@ -690,8 +684,6 @@
<classpath>
<path refid="api.classpath"/>
<path refid="core.classpath"/>
- <pathelement location="${lib.marshalling-api.local}"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="protocol/basic/target/main/.lastcompile" verbose="false"/>
@@ -814,7 +806,6 @@
<classpath>
<path refid="api.classpath"/>
<path refid="standalone.classpath"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="samples/target/main/.lastcompile" verbose="false"/>
@@ -855,7 +846,6 @@
<classpath>
<path refid="api.classpath"/>
<path refid="core.classpath"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="standalone/target/main/.lastcompile" verbose="false"/>
@@ -935,7 +925,6 @@
<compilerarg value="-Xlint:unchecked"/>
<classpath>
<path refid="api.classpath"/>
- <pathelement location="${lib.xnio-api.local}"/>
</classpath>
</javac>
<touch file="transporter/target/main/.lastcompile" verbose="false"/>
@@ -1090,8 +1079,6 @@
<path refid="api.classpath"/>
<path refid="standalone.classpath"/>
<path refid="transporter.classpath"/>
- <pathelement location="${lib.xnio-api.local}"/>
- <pathelement location="${lib.marshalling-api.local}"/>
</classpath>
</javadoc>
</target>
16 years, 1 month
JBoss Remoting SVN: r4717 - in remoting3/trunk: protocol/basic/src/main/java/org/jboss/remoting/protocol/basic and 1 other directories.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-11-19 21:42:59 -0500 (Wed, 19 Nov 2008)
New Revision: 4717
Modified:
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicRequestHandler.java
remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java
remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java
remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java
Log:
Minor cleanup
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -106,7 +106,7 @@
}
public String toString() {
- return "local request handler <" + Integer.toString(hashCode(), 16) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ return "local request handler <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
}
static class Config<I, O> {
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -92,7 +92,7 @@
}
public String toString() {
- return "local request handler source <" + Integer.toString(hashCode(), 16) + "> (request listener = " + String.valueOf(requestListener) + ")";
+ return "local request handler source <" + Integer.toHexString(hashCode()) + "> (request listener = " + String.valueOf(requestListener) + ")";
}
static class Config<I, O> {
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicRequestHandler.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicRequestHandler.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicRequestHandler.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -96,6 +96,6 @@
}
public String toString() {
- return "basic protocol handler <" + Integer.toString(hashCode(), 16) + ">";
+ return "basic protocol handler <" + Integer.toHexString(hashCode()) + ">";
}
}
Modified: remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java
===================================================================
--- remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexReplyHandler.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -101,6 +101,6 @@
}
public String toString() {
- return "forwarding reply handler <" + Integer.toString(hashCode(), 16) + "> (request id = " + requestId + ") for " + connection;
+ return "forwarding reply handler <" + Integer.toHexString(hashCode()) + "> (request id = " + requestId + ") for " + connection;
}
}
Modified: remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java
===================================================================
--- remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandler.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -100,7 +100,7 @@
}
public String toString() {
- return "forwarding request handler <" + Integer.toString(hashCode(), 16) + "> (id = " + identifier + ") for " + connection;
+ return "forwarding request handler <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
}
}
@@ -131,6 +131,6 @@
}
public String toString() {
- return "remote request context <" + Integer.toString(hashCode(), 16) + "> (request id = " + id + ") for " + connection;
+ return "remote request context <" + Integer.toHexString(hashCode()) + "> (request id = " + id + ") for " + connection;
}
}
Modified: remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java
===================================================================
--- remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java 2008-11-20 01:27:27 UTC (rev 4716)
+++ remoting3/trunk/protocol/multiplex/src/main/java/org/jboss/remoting/protocol/multiplex/MultiplexRequestHandlerSource.java 2008-11-20 02:42:59 UTC (rev 4717)
@@ -87,6 +87,6 @@
}
public String toString() {
- return "forwarding request handler source <" + Integer.toString(hashCode(), 16) + "> (id = " + identifier + ") for " + connection;
+ return "forwarding request handler source <" + Integer.toHexString(hashCode()) + "> (id = " + identifier + ") for " + connection;
}
}
16 years, 1 month
JBoss Remoting SVN: r4716 - remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-11-19 20:27:27 -0500 (Wed, 19 Nov 2008)
New Revision: 4716
Added:
remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterMethodDescriptor.java
Modified:
remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocation.java
remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java
remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterRequestListener.java
Log:
Transporter: cache method descriptors to reduce net traffic; update javadoc; switch to externalizer
Modified: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocation.java
===================================================================
--- remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocation.java 2008-11-20 01:08:06 UTC (rev 4715)
+++ remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocation.java 2008-11-20 01:27:27 UTC (rev 4716)
@@ -26,73 +26,101 @@
import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.InvalidClassException;
+import org.jboss.marshalling.Creator;
/**
- *
+ * An invocation made on a transporter. Instances of this class are used internally by transporters to represent
+ * a method call that is being forwarded to a remote instance. This class is not part of the public API and should
+ * not be used directly, as members may be added or removed without notice.
*/
-public final class TransporterInvocation implements Externalizable {
+public final class TransporterInvocation {
- private static final long serialVersionUID = -1643169469978213945L;
- private String name;
- private Class<?>[] parameterTypes;
- private Object[] args;
+ private final TransporterMethodDescriptor methodDescriptor;
+ private final Object[] args;
- public TransporterInvocation() {
- }
-
- public TransporterInvocation(final String name, final Class<?>[] parameterTypes, final Object[] args) {
- if (parameterTypes.length != args.length) {
+ /**
+ * Construct an intialized instance.
+ *
+ * @param methodDescriptor
+ * @param args the arguments
+ */
+ public TransporterInvocation(final TransporterMethodDescriptor methodDescriptor, final Object[] args) {
+ if (methodDescriptor.getParameterTypes().length != args.length) {
throw new IllegalArgumentException("parameter type array length differs from arg array length");
}
- this.name = name;
- this.parameterTypes = parameterTypes;
+ this.methodDescriptor = methodDescriptor;
this.args = args;
}
- public void writeExternal(final ObjectOutput out) throws IOException {
- out.writeObject(name);
- final Class<?>[] parameterTypes = this.parameterTypes;
- final Object[] args = this.args;
- final int len = parameterTypes.length;
- if (len != args.length) {
- throw new IllegalStateException("parameter types and/or args length changed");
- }
- if (len > 0xffff) {
- throw new IllegalArgumentException("too many parameters");
- }
- out.writeShort(len);
- for (Class<?> type : parameterTypes) {
- out.writeObject(type);
- }
- for (Object arg : args) {
- out.writeObject(arg);
- }
+ /**
+ * Get the method descriptor.
+ *
+ * @return the method descriptor
+ */
+ public TransporterMethodDescriptor getMethodDescriptor() {
+ return methodDescriptor;
}
- public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
- name = (String) in.readObject();
- final int cnt = in.readShort() & 0xffff;
- final Class<?>[] parameterTypes = new Class<?>[cnt];
- for (int i = 0; i < cnt; i ++) {
- parameterTypes[i] = (Class<?>) in.readObject();
+ /**
+ * Get the method call arguments.
+ *
+ * @return the method call arguments
+ */
+ public Object[] getArgs() {
+ return args;
+ }
+
+ /**
+ * An externalizer for a transporter invocation.
+ */
+ public static final class Externalizer implements org.jboss.marshalling.Externalizer, Externalizable {
+
+ private static final long serialVersionUID = 6676707007545161200L;
+
+ /** {@inheritDoc} */
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ if (o instanceof TransporterInvocation) {
+ final TransporterInvocation invocation = (TransporterInvocation) o;
+ final TransporterMethodDescriptor methodDescriptor = invocation.methodDescriptor;
+ output.writeObject(methodDescriptor);
+ final Object[] args = invocation.args;
+ final int len = methodDescriptor.getParameterTypes().length;
+ if (len != args.length) {
+ throw new IllegalStateException("argument length mismatch");
+ }
+ for (Object arg : args) {
+ output.writeObject(arg);
+ }
+ } else {
+ throw new InvalidClassException(o.getClass().getName(), "Wrong class for externalizer");
+ }
}
- final Object[] args = new Object[cnt];
- for (int i = 0; i < cnt; i ++) {
- args[i] = in.readObject();
+
+ /** {@inheritDoc} */
+ public Object createExternal(final Class<?> objectClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final TransporterMethodDescriptor methodDescriptor = (TransporterMethodDescriptor) input.readObject();
+ final int cnt = methodDescriptor.getParameterTypes().length;
+ final Object[] args = new Object[cnt];
+ for (int i = 0; i < cnt; i ++) {
+ args[i] = input.readObject();
+ }
+ return new TransporterInvocation(methodDescriptor, args);
}
- this.parameterTypes = parameterTypes;
- this.args = args;
- }
- public String getName() {
- return name;
- }
+ /** {@inheritDoc} */
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // already initialized
+ }
- public Class<?>[] getParameterTypes() {
- return parameterTypes;
- }
+ /** {@inheritDoc} */
+ public void writeExternal(final ObjectOutput out) throws IOException {
+ // no fields
+ }
- public Object[] getArgs() {
- return args;
+ /** {@inheritDoc} */
+ public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
+ // no fields
+ }
}
}
Modified: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java
===================================================================
--- remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java 2008-11-20 01:08:06 UTC (rev 4715)
+++ remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterInvocationHandler.java 2008-11-20 01:27:27 UTC (rev 4716)
@@ -25,15 +25,18 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.io.IOException;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.jboss.remoting.Client;
import org.jboss.remoting.RemoteExecutionException;
import org.jboss.xnio.IoUtils;
/**
- *
+ * The transporter reflection invocation handler.
*/
public final class TransporterInvocationHandler implements InvocationHandler {
private final Client<TransporterInvocation, Object> client;
+ private final ConcurrentMap<Method, TransporterMethodDescriptor> descriptorCache = new ConcurrentHashMap<Method, TransporterMethodDescriptor>();
public TransporterInvocationHandler(final Client<TransporterInvocation, Object> client) {
this.client = client;
@@ -41,7 +44,20 @@
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
try {
- return client.invoke(new TransporterInvocation(method.getName(), method.getParameterTypes(), args));
+ final TransporterMethodDescriptor descriptor;
+ final TransporterMethodDescriptor cachedDescriptor = descriptorCache.get(method);
+ if (cachedDescriptor == null) {
+ final TransporterMethodDescriptor newDescriptor = new TransporterMethodDescriptor(method.getName(), method.getParameterTypes());
+ final TransporterMethodDescriptor suddenDescriptor = descriptorCache.putIfAbsent(method, newDescriptor);
+ if (suddenDescriptor != null) {
+ descriptor = suddenDescriptor;
+ } else {
+ descriptor = newDescriptor;
+ }
+ } else {
+ descriptor = cachedDescriptor;
+ }
+ return client.invoke(new TransporterInvocation(descriptor, args));
} catch (RemoteExecutionException e) {
throw e.getCause();
} catch (IOException e) {
Added: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterMethodDescriptor.java
===================================================================
--- remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterMethodDescriptor.java (rev 0)
+++ remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterMethodDescriptor.java 2008-11-20 01:27:27 UTC (rev 4716)
@@ -0,0 +1,139 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting.transporter;
+
+import java.util.Arrays;
+import java.io.ObjectOutput;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.Externalizable;
+import java.io.InvalidClassException;
+import java.io.InvalidObjectException;
+import org.jboss.marshalling.Creator;
+
+/**
+ * A method descriptor.
+ */
+public final class TransporterMethodDescriptor {
+ private final String name;
+ private final Class<?>[] parameterTypes;
+
+ /**
+ * Create a new instance.
+ *
+ * @param name the method name
+ * @param parameterTypes the method parameter types
+ */
+ public TransporterMethodDescriptor(final String name, final Class<?>[] parameterTypes) {
+ this.name = name;
+ this.parameterTypes = parameterTypes;
+ }
+
+ /**
+ * Get the method name.
+ *
+ * @return the method name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Get the parameter types.
+ *
+ * @return the parameter types
+ */
+ public Class<?>[] getParameterTypes() {
+ return parameterTypes;
+ }
+
+ /** {@inheritDoc} */
+ public boolean equals(final Object o) {
+ if (this == o) return true;
+ if (! (o instanceof TransporterMethodDescriptor)) return false;
+ final TransporterMethodDescriptor that = (TransporterMethodDescriptor) o;
+ if (!name.equals(that.name)) return false;
+ if (!Arrays.equals(parameterTypes, that.parameterTypes)) return false;
+ return true;
+ }
+
+ /** {@inheritDoc} */
+ public int hashCode() {
+ int result = name.hashCode();
+ result = 31 * result + Arrays.hashCode(parameterTypes);
+ return result;
+ }
+
+ /**
+ * The externalizer for {@code TransporterMethodDescriptor}.
+ */
+ public static final class Externalizer implements org.jboss.marshalling.Externalizer, Externalizable {
+
+ private static final long serialVersionUID = 8081458273093788910L;
+
+ /** {@inheritDoc} */
+ public void writeExternal(final Object o, final ObjectOutput output) throws IOException {
+ if (o instanceof TransporterMethodDescriptor) {
+ final TransporterMethodDescriptor descriptor = (TransporterMethodDescriptor) o;
+ output.writeObject(descriptor.name);
+ final Class<?>[] types = descriptor.parameterTypes;
+ final int len = types.length;
+ if (len > 0xffff) {
+ throw new InvalidObjectException("Too many parameter types");
+ }
+ output.writeShort(len);
+ for (Class<?> type : descriptor.parameterTypes) {
+ output.writeObject(type);
+ }
+ } else {
+ throw new InvalidClassException(o.getClass().getName(), "Wrong class for externalizer");
+ }
+ }
+
+ /** {@inheritDoc} */
+ public Object createExternal(final Class<?> aClass, final ObjectInput input, final Creator creator) throws IOException, ClassNotFoundException {
+ final String name = (String) input.readObject();
+ final int len = input.readShort() & 0xffff;
+ final Class<?>[] types = new Class<?>[len];
+ for (int i = 0; i < len; i ++) {
+ types[i] = (Class<?>) input.readObject();
+ }
+ return new TransporterMethodDescriptor(name, types);
+ }
+
+ /** {@inheritDoc} */
+ public void readExternal(final Object o, final ObjectInput input) throws IOException, ClassNotFoundException {
+ // already initialized
+ }
+
+ /** {@inheritDoc} */
+ public void writeExternal(final ObjectOutput out) throws IOException {
+ // no fields
+ }
+
+ /** {@inheritDoc} */
+ public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
+ // no fields
+ }
+ }
+}
Modified: remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterRequestListener.java
===================================================================
--- remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterRequestListener.java 2008-11-20 01:08:06 UTC (rev 4715)
+++ remoting3/trunk/transporter/src/main/java/org/jboss/remoting/transporter/TransporterRequestListener.java 2008-11-20 01:27:27 UTC (rev 4716)
@@ -30,7 +30,7 @@
import java.io.IOException;
/**
- *
+ * Transporter request listener. Used to implement the receiving end of a transporter invocation.
*/
public final class TransporterRequestListener<T> extends AbstractRequestListener<TransporterInvocation,Object> {
private final T target;
@@ -41,7 +41,8 @@
public void handleRequest(final RequestContext<Object> context, final TransporterInvocation request) throws RemoteExecutionException {
try {
- final Method method = target.getClass().getMethod(request.getName(), request.getParameterTypes());
+ final TransporterMethodDescriptor methodDescriptor = request.getMethodDescriptor();
+ final Method method = target.getClass().getMethod(methodDescriptor.getName(), methodDescriptor.getParameterTypes());
method.invoke(target, request.getArgs());
} catch (NoSuchMethodException e) {
doSendFailure(context, new NoSuchMethodError("No such method on the remote side: " + e.getMessage()));
@@ -52,9 +53,9 @@
}
}
- private void doSendFailure(final RequestContext<Object> context, final Throwable throwable) {
+ private static void doSendFailure(final RequestContext<Object> context, final Throwable throwable) {
try {
- context.sendFailure(null, throwable);
+ context.sendFailure("", throwable);
} catch (IOException e) {
e.printStackTrace();
}
16 years, 1 month
JBoss Remoting SVN: r4715 - remoting3/trunk/standalone/src/main/java/org/jboss/remoting.
by jboss-remoting-commits＠lists.jboss.org
Author: david.lloyd(a)jboss.com
Date: 2008-11-19 20:08:06 -0500 (Wed, 19 Nov 2008)
New Revision: 4715
Modified:
remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java
Log:
Javadoc updates
Modified: remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java
===================================================================
--- remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java 2008-11-20 01:07:52 UTC (rev 4714)
+++ remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java 2008-11-20 01:08:06 UTC (rev 4715)
@@ -15,14 +15,28 @@
import org.jboss.xnio.IoUtils;
/**
- *
+ * The standalone interface into Remoting. This class contains static methods that are useful to standalone programs
+ * for managing endpoints and services in a simple fashion.
*/
public final class Remoting {
+ /**
+ * Create an endpoint. The endpoint will create its own thread pool with a maximum of 10 threads.
+ *
+ * @param name the name of the endpoint
+ * @return the endpoint
+ */
public static Endpoint createEndpoint(final String name) {
return createEndpoint(name, 10);
}
+ /**
+ * Create an endpoint. The endpoint will create its own thread pool with a maximum of {@code maxThreads} threads.
+ *
+ * @param name the name of the endpoint
+ * @param maxThreads the maximum thread count
+ * @return the endpoint
+ */
public static Endpoint createEndpoint(final String name, final int maxThreads) {
final ThreadPoolExecutor executor = new ThreadPoolExecutor(0, maxThreads, Long.MAX_VALUE, TimeUnit.NANOSECONDS, new AlwaysBlockingQueue<Runnable>(new SynchronousQueue<Runnable>()), new ThreadPoolExecutor.AbortPolicy());
final EndpointImpl endpoint = new EndpointImpl(executor, name);
@@ -39,10 +53,30 @@
return endpoint;
}
+ /**
+ * Create an endpoint using the given {@code Executor} to execute tasks.
+ *
+ * @param executor the executor to use
+ * @param name the name of the endpoint
+ * @return the endpoint
+ */
public static Endpoint createEndpoint(final Executor executor, final String name) {
return new EndpointImpl(executor, name);
}
+ /**
+ * Create a local client from a request listener. The client will retain the sole reference to the request listener,
+ * so when the client is closed, the listener will also be closed (unless the client is sent to a remote endpoint).
+ *
+ * @param endpoint the endpoint to bind the request listener to
+ * @param requestListener the request listener
+ * @param requestClass the request class
+ * @param replyClass the reply class
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @return a new client
+ * @throws IOException if an error occurs
+ */
public static <I, O> Client<I, O> createLocalClient(final Endpoint endpoint, final RequestListener<I, O> requestListener, final Class<I> requestClass, final Class<O> replyClass) throws IOException {
final Handle<RequestHandler> handle = endpoint.createRequestHandler(requestListener, requestClass, replyClass);
try {
@@ -52,6 +86,16 @@
}
}
+ /**
+ * Create a local client source from a local service configuration. The client source will be registered on the endpoint.
+ *
+ * @param endpoint the endpoint to bind the service to
+ * @param config the service configuration
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @return a new client source
+ * @throws IOException if an error occurs
+ */
public static <I, O> ClientSource<I, O> createLocalClientSource(final Endpoint endpoint, final LocalServiceConfiguration<I, O> config) throws IOException {
final Handle<RequestHandlerSource> handle = endpoint.registerService(config);
try {
16 years, 1 month