Author: donsez
Date: Tue Jan 15 12:28:29 2008
New Revision: 612206
URL: http://svn.apache.org/viewvc?rev=612206&view=rev
Log:
refactor the sources to add sandbox to the package names.
Added:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/
- copied from r567866,
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/wireadmin/cmd/
felix/sandbox/donsez/wireadmin.cmd/src/site/
- copied from r567866, felix/sandbox/donsez/wireadmin.cmd/doc/
Removed:
felix/sandbox/donsez/wireadmin.cmd/doc/
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Activator.java
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/wireadmin/
Modified:
felix/sandbox/donsez/wireadmin.cmd/pom.xml
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/DictionaryDelegate.java
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/ServiceReferenceDelegate.java
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Util.java
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmd.java
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmdImpl.java
felix/sandbox/donsez/wireadmin.cmd/src/main/resources/OSGI-INF/component.xml
Modified: felix/sandbox/donsez/wireadmin.cmd/pom.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/pom.xml?rev=612206&r1=612205&r2=612206&view=diff
==============================================================================
--- felix/sandbox/donsez/wireadmin.cmd/pom.xml (original)
+++ felix/sandbox/donsez/wireadmin.cmd/pom.xml Tue Jan 15 12:28:29 2008
@@ -19,51 +19,38 @@
<project>
<properties>
-
<repositoryLocation>http://www-adele.imag.fr/users/Didier.Donsez/dev/felix/sandbox/</repositoryLocation>
+
<repositoryLocation>http://people.apache.org/~donsez/dev/felix/sandbox/</repositoryLocation>
+ <description>shell command to use the WireAdmin
service.</description>
</properties>
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix WireAdmin Command</name>
- <description>shell command to use the WireAdmin service.</description>
- <artifactId>org.apache.felix.wireadmin.cmd</artifactId>
-
+ <artifactId>org.apache.felix.sandbox.wireadmin.cmd</artifactId>
+ <groupId>org.apache.felix.sandbox</groupId>
+ <version>0.1.0</version>
+ <description>${description}</description>
<dependencies>
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
</dependencies>
@@ -76,20 +63,10 @@
<configuration>
<instructions>
<Export-Service>org.apache.felix.shell.Command</Export-Service>
-
<Import-Service>org.osgi.service.wireadmin.WireAdmin</Import-Service>
-
- <Private-Package>org.apache.felix.wireadmin.cmd.*</Private-Package>
+
<!--<Import-Service>org.osgi.service.wireadmin.WireAdmin</Import-Service>-->
+ <Private-Package>${pom.artifactId}</Private-Package>
<Import-Package>*</Import-Package>
-
<Bundle-Activator>${pom.artifactId}.WireAdminCmdImpl</Bundle-Activator>
-
-
<Bundle-DocUrl>${repositoryLocation}${pom.artifactId}/index.html</Bundle-DocUrl>
-
<Bundle-Url>${repositoryLocation}${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</Bundle-Url>
-
<Bundle-Source>${repositoryLocation}${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</Bundle-Source>
-
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Description>shell command to use the
WireAdminBinder.</Bundle-Description>
- <!-- <Service-Component>OSGI-INF/component.xml</Service-Component>
-->
-
+ <Service-Component>OSGI-INF/component.xml</Service-Component>
</instructions>
</configuration>
</plugin>
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/DictionaryDelegate.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/DictionaryDelegate.java?rev=612206&r1=567866&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/DictionaryDelegate.java
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/DictionaryDelegate.java
Tue Jan 15 12:28:29 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.wireadmin.cmd;
+package org.apache.felix.sandbox.wireadmin.cmd;
import java.util.Dictionary;
import java.util.Enumeration;
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/ServiceReferenceDelegate.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/ServiceReferenceDelegate.java?rev=612206&r1=567866&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/ServiceReferenceDelegate.java
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/ServiceReferenceDelegate.java
Tue Jan 15 12:28:29 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.wireadmin.cmd;
+package org.apache.felix.sandbox.wireadmin.cmd;
import java.util.Dictionary;
import java.util.Enumeration;
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Util.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Util.java?rev=612206&r1=567866&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Util.java
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/Util.java
Tue Jan 15 12:28:29 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.wireadmin.cmd;
+package org.apache.felix.sandbox.wireadmin.cmd;
import java.io.PrintStream;
import java.util.Dictionary;
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmd.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmd.java?rev=612206&r1=567866&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmd.java
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmd.java
Tue Jan 15 12:28:29 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.wireadmin.cmd;
+package org.apache.felix.sandbox.wireadmin.cmd;
import java.io.PrintStream;
import java.util.Dictionary;
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmdImpl.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmdImpl.java?rev=612206&r1=567866&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmdImpl.java
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/java/org/apache/felix/sandbox/wireadmin/cmd/WireAdminCmdImpl.java
Tue Jan 15 12:28:29 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.felix.wireadmin.cmd;
+package org.apache.felix.sandbox.wireadmin.cmd;
import java.io.PrintStream;
import java.util.Dictionary;
Modified:
felix/sandbox/donsez/wireadmin.cmd/src/main/resources/OSGI-INF/component.xml
URL:
http://svn.apache.org/viewvc/felix/sandbox/donsez/wireadmin.cmd/src/main/resources/OSGI-INF/component.xml?rev=612206&r1=612205&r2=612206&view=diff
==============================================================================
---
felix/sandbox/donsez/wireadmin.cmd/src/main/resources/OSGI-INF/component.xml
(original)
+++
felix/sandbox/donsez/wireadmin.cmd/src/main/resources/OSGI-INF/component.xml
Tue Jan 15 12:28:29 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<component name="wireadmincmd">
<!-- xmlns="http://www.osgi.org/xmlns/scr/v1.0.0" -->
- <implementation class="org.apache.felix.wireadmin.cmd.WireAdminCmd"/>
+ <implementation
class="org.apache.felix.sandbox.wireadmin.cmd.WireAdminCmd"/>
<service>
<provide interface="org.apache.felix.shell.Command"/>