[jboss-remoting-commits] JBoss Remoting SVN: r4610 - in remoting3/trunk: samples/src/main/java/org/jboss/remoting/samples/simple and 1 other directory.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-10-22 20:04:24 -0400 (Wed, 22 Oct 2008)
New Revision: 4610

Removed:
   remoting3/trunk/http-se6/
   remoting3/trunk/http-servlet/
   remoting3/trunk/http-urlconnection/
   remoting3/trunk/http/
   remoting3/trunk/sasl-null/
   remoting3/trunk/srp/
   remoting3/trunk/transaction/
Modified:
   remoting3/trunk/build.xml
   remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java
   remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java
Log:
Remove old/obsolete code

Modified: remoting3/trunk/build.xml
===================================================================
--- remoting3/trunk/build.xml	2008-10-23 00:00:34 UTC (rev 4609)
+++ remoting3/trunk/build.xml	2008-10-23 00:04:24 UTC (rev 4610)
@@ -1107,7 +1107,7 @@
         </jar>
     </target>
 
-    <target name="standalone-jar" description="Build the standalone JAR" depends="api,core,standalone,util,version">
+    <target name="standalone-jar" description="Build the standalone JAR" depends="api,core,standalone,transporter,util,version">
         <delete file="jboss-remoting-standalone.jar"/>
         <jar jarfile="jboss-remoting-standalone.jar">
             <manifest>
@@ -1127,10 +1127,10 @@
             <zipfileset dir="core/target/main/classes">
                 <include name="**/*.class"/>
             </zipfileset>
-            <zipfileset dir="srp/target/main/classes">
+            <zipfileset dir="standalone/target/main/classes">
                 <include name="**/*.class"/>
             </zipfileset>
-            <zipfileset dir="standalone/target/main/classes">
+            <zipfileset dir="transporter/target/main/classes">
                 <include name="**/*.class"/>
             </zipfileset>
             <zipfileset dir="util/target/main/classes">

Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java	2008-10-23 00:00:34 UTC (rev 4609)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java	2008-10-23 00:04:24 UTC (rev 4610)
@@ -1,12 +1,9 @@
 package org.jboss.remoting.samples.simple;
 
 import java.io.IOException;
-import java.security.Security;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.RemoteExecutionException;
 import org.jboss.remoting.Remoting;
-import org.jboss.remoting.core.security.sasl.Provider;
 import org.jboss.xnio.IoUtils;
 
 /**
@@ -14,8 +11,10 @@
  */
 public final class LocalBasicExampleMain {
 
-    public static void main(String[] args) throws IOException, RemoteExecutionException {
-        Security.addProvider(new Provider());
+    private LocalBasicExampleMain() {
+    }
+
+    public static void main(String[] args) throws IOException {
         final StringRot13RequestListener listener = new StringRot13RequestListener();
         final Endpoint endpoint = Remoting.createEndpoint("simple");
         try {

Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java	2008-10-23 00:00:34 UTC (rev 4609)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java	2008-10-23 00:04:24 UTC (rev 4610)
@@ -4,12 +4,9 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
-import java.security.Security;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.Endpoint;
-import org.jboss.remoting.RemoteExecutionException;
 import org.jboss.remoting.Remoting;
-import org.jboss.remoting.core.security.sasl.Provider;
 import org.jboss.xnio.IoUtils;
 
 /**
@@ -20,8 +17,7 @@
     private LocalStreamExampleMain() {
     }
 
-    public static void main(String[] args) throws IOException, RemoteExecutionException {
-        Security.addProvider(new Provider());
+    public static void main(String[] args) throws IOException {
         final StreamingRot13RequestListener listener = new StreamingRot13RequestListener();
         final Endpoint endpoint = Remoting.createEndpoint("simple");
         try {