felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r999070 - in /felix/trunk/gogo/runtime: ./ src/main/java/org/apache/felix/gogo/runtime/ src/main/java/org/apache/felix/gogo/runtime/activator/ src/main/java/org/apache/felix/gogo/runtime/threadio/ src/main/java/org/apache/felix/service/comm...
Date Mon, 20 Sep 2010 19:23:20 GMT
Author: rickhall
Date: Mon Sep 20 19:23:19 2010
New Revision: 999070

URL: http://svn.apache.org/viewvc?rev=999070&view=rev
Log:
Put provisional OSGi API in the felix namespace and guard it with a
mandatory attribute. (FELIX-2441)

Added:
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
      - copied, changed from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
      - copied, changed from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
      - copied, changed from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
      - copied, changed from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
      - copied, changed from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java
Removed:
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/
    felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/
Modified:
    felix/trunk/gogo/runtime/pom.xml
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
    felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
    felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
    felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java

Modified: felix/trunk/gogo/runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Mon Sep 20 19:23:19 2010
@@ -56,9 +56,8 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            org.apache.felix.service.command; version=${project.version},
-                            org.osgi.service.command; version=${project.version},
-                            org.osgi.service.threadio; version=${project.version}
+                            org.apache.felix.service.command;
+                            org.apache.felix.service.threadio; version=${project.version};
status="provisional"; mandatory:="status"
                         </Export-Package>
                         <Import-Package>
                             org.osgi.service.log*; resolution:=optional,

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Closure.java Mon
Sep 20 19:23:19 2010
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.felix.gogo.runtime.Tokenizer.Type;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 
 public class Closure implements Function, Evaluate
 {

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProcessorImpl.java
Mon Sep 20 19:23:19 2010
@@ -31,11 +31,11 @@ import java.util.WeakHashMap;
 import java.util.Map.Entry;
 
 import org.osgi.framework.BundleContext;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.threadio.ThreadIO;
 
 public class CommandProcessorImpl implements CommandProcessor
 {

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandProxy.java
Mon Sep 20 19:23:19 2010
@@ -20,8 +20,8 @@ package org.apache.felix.gogo.runtime;
 
 import java.util.List;
 
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.BundleContext;
 

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/CommandSessionImpl.java
Mon Sep 20 19:23:19 2010
@@ -21,9 +21,9 @@
 // DWB10: add SCOPE support: https://www.osgi.org/bugzilla/show_bug.cgi?id=51
 package org.apache.felix.gogo.runtime;
 
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Converter;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Pipe.java Mon Sep
20 19:23:19 2010
@@ -26,7 +26,7 @@ import java.io.PrintStream;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.osgi.service.command.Converter;
+import org.apache.felix.service.command.Converter;
 
 public class Pipe extends Thread
 {

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/Reflective.java Mon
Sep 20 19:23:19 2010
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
 import org.apache.felix.service.command.Parameter;
 
 public final class Reflective

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/activator/Activator.java
Mon Sep 20 19:23:19 2010
@@ -30,10 +30,10 @@ import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
-import org.osgi.service.command.CommandProcessor;
-import org.osgi.service.command.Converter;
-import org.osgi.service.command.Function;
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.command.CommandProcessor;
+import org.apache.felix.service.command.Converter;
+import org.apache.felix.service.command.Function;
+import org.apache.felix.service.threadio.ThreadIO;
 import org.osgi.util.tracker.ServiceTracker;
 
 public class Activator implements BundleActivator

Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java
Mon Sep 20 19:23:19 2010
@@ -19,7 +19,7 @@
 // DWB20: ThreadIO should check and reset IO if something (e.g. jetty) overrides
 package org.apache.felix.gogo.runtime.threadio;
 
-import org.osgi.service.threadio.ThreadIO;
+import org.apache.felix.service.threadio.ThreadIO;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
(from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java&r1=998996&r2=999070&rev=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandProcessor.java
(original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandProcessor.java
Mon Sep 20 19:23:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
(from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java&r1=998996&r2=999070&rev=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/CommandSession.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/CommandSession.java
Mon Sep 20 19:23:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
(from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java&r1=998996&r2=999070&rev=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Converter.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Converter.java
Mon Sep 20 19:23:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 /**
  * A converter is a service that can help create specific object types from a

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
(from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java&r1=998996&r2=999070&rev=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/command/Function.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/Function.java
Mon Sep 20 19:23:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.command;
+package org.apache.felix.service.command;
 
 import java.util.List;
 

Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
(from r998996, felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java)
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java&p1=felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java&r1=998996&r2=999070&rev=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/main/java/org/osgi/service/threadio/ThreadIO.java (original)
+++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/ThreadIO.java
Mon Sep 20 19:23:19 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.osgi.service.threadio;
+package org.apache.felix.service.threadio;
 
 import java.io.InputStream;
 import java.io.PrintStream;

Modified: felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java (original)
+++ felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/Context.java Mon
Sep 20 19:23:19 2010
@@ -19,7 +19,7 @@
 package org.apache.felix.gogo.runtime;
 
 import org.apache.felix.gogo.runtime.threadio.ThreadIOImpl;
-import org.osgi.service.command.CommandSession;
+import org.apache.felix.service.command.CommandSession;
 
 public class Context extends CommandProcessorImpl
 {

Modified: felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java?rev=999070&r1=999069&r2=999070&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java (original)
+++ felix/trunk/gogo/runtime/src/test/java/org/apache/felix/gogo/runtime/TestParser.java Mon
Sep 20 19:23:19 2010
@@ -22,8 +22,8 @@ import junit.framework.TestCase;
 
 import org.apache.felix.gogo.runtime.Parser;
 import org.apache.felix.gogo.runtime.Token;
-import org.osgi.service.command.CommandSession;
-import org.osgi.service.command.Function;
+import org.apache.felix.service.command.CommandSession;
+import org.apache.felix.service.command.Function;
 
 import java.io.BufferedReader;
 import java.io.IOException;



Mime
View raw message