felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r439586 - in /incubator/felix/trunk/org.osgi.compendium: pom.xml src/main/java/org/osgi/service/io/ConnectionFactory.java src/main/java/org/osgi/service/io/ConnectorService.java
Date Sat, 02 Sep 2006 12:56:14 GMT
Author: marrs
Date: Sat Sep  2 05:56:13 2006
New Revision: 439586

URL: http://svn.apache.org/viewvc?rev=439586&view=rev
Log:
FELIX-138 Removed the dependency to javax.microedition.io and patched the IO service to use
explicit values instead of constants and use more generic classes instead of the specific
ones contained in the io package. This patch will be reversed as soon as licensing issues
are resolved.

Modified:
    incubator/felix/trunk/org.osgi.compendium/pom.xml
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
    incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java

Modified: incubator/felix/trunk/org.osgi.compendium/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/pom.xml?rev=439586&r1=439585&r2=439586&view=diff
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/pom.xml (original)
+++ incubator/felix/trunk/org.osgi.compendium/pom.xml Sat Sep  2 05:56:13 2006
@@ -21,12 +21,14 @@
       <version>${pom.version}</version>
       <scope>provided</scope>
     </dependency>
+<!--
     <dependency>
       <groupId>javax.microedition</groupId>
       <artifactId>javax.microedition</artifactId>
       <version>1.0.4</version>
       <scope>provided</scope>
     </dependency>
+-->
   </dependencies>
   <build>
     <plugins>
@@ -52,4 +54,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java?rev=439586&r1=439585&r2=439586&view=diff
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
(original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectionFactory.java
Sat Sep  2 05:56:13 2006
@@ -17,7 +17,7 @@
  */
 package org.osgi.service.io;
 
-import javax.microedition.io.*;
+//import javax.microedition.io.*;
 import java.io.*;
 
 /**
@@ -56,6 +56,6 @@
 	 * @throws IOException If a <code>javax.microedition.io.Connection</code>
 	 *         object can not not be created.
 	 */
-	public Connection createConnection(String name, int mode, boolean timeouts)
+	public /*Connection*/ Object createConnection(String name, int mode, boolean timeouts)
 			throws IOException;
 }

Modified: incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java?rev=439586&r1=439585&r2=439586&view=diff
==============================================================================
--- incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java
(original)
+++ incubator/felix/trunk/org.osgi.compendium/src/main/java/org/osgi/service/io/ConnectorService.java
Sat Sep  2 05:56:13 2006
@@ -18,7 +18,7 @@
 package org.osgi.service.io;
 
 import java.io.*;
-import javax.microedition.io.*;
+//import javax.microedition.io.*;
 
 /**
  * The Connector Service should be called to create and open
@@ -48,19 +48,19 @@
 	 * 
 	 * @see "javax.microedition.io.Connector.READ"
 	 */
-	public static final int	READ		= Connector.READ;
+	public static final int	READ		= /* Connector.READ */ 1;
 	/**
 	 * Write access mode.
 	 * 
 	 * @see "javax.microedition.io.Connector.WRITE"
 	 */
-	public static final int	WRITE		= Connector.WRITE;
+	public static final int	WRITE		= /* Connector.WRITE */ 2;
 	/**
 	 * Read/Write access mode.
 	 * 
 	 * @see "javax.microedition.io.Connector.READ_WRITE"
 	 */
-	public static final int	READ_WRITE	= Connector.READ_WRITE;
+	public static final int	READ_WRITE	= /* Connector.READ_WRITE */ 3;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name.
@@ -73,7 +73,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "javax.microedition.io.Connector.open(String name)"
 	 */
-	public Connection open(String name) throws IOException;
+	public /* Connection */ Object open(String name) throws IOException;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name and
@@ -88,7 +88,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "javax.microedition.io.Connector.open(String name, int mode)"
 	 */
-	public Connection open(String name, int mode) throws IOException;
+	public /* Connection */ Object open(String name, int mode) throws IOException;
 
 	/**
 	 * Create and open a <code>Connection</code> object for the specified name,
@@ -105,7 +105,7 @@
 	 * @throws IOException If some other kind of I/O error occurs.
 	 * @see "<code>javax.microedition.io.Connector.open</code>"
 	 */
-	public Connection open(String name, int mode, boolean timeouts)
+	public /* Connection */ Object open(String name, int mode, boolean timeouts)
 			throws IOException;
 
 	/**



Mime
View raw message