Author: rotty3000 Date: Fri Dec 21 20:22:59 2018 New Revision: 1849492 URL: http://svn.apache.org/viewvc?rev=1849492&view=rev Log: FELIX-5970 follow up work, fix anno package name, add cap&req versions, propertytype, etc.
Signed-off-by: Raymond Auge <[email protected]> Added: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/GogoCommand.java - copied, changed from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogo.java - copied, changed from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogoWhiteboard.java - copied, changed from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/package-info.java - copied, changed from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/package-info.java - copied, changed from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/package-info.java - copied, changed from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java Removed: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java Modified: felix/trunk/gogo/command/pom.xml felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/package-info.java felix/trunk/gogo/gogo-parent/pom.xml felix/trunk/gogo/itest-jline/pom.xml felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java felix/trunk/gogo/itest-shell/pom.xml felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java felix/trunk/gogo/jline/pom.xml felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/package-info.java felix/trunk/gogo/runtime/pom.xml 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/package-info.java felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/threadio/ThreadIOImpl.java felix/trunk/gogo/shell/pom.xml felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/package-info.java Modified: felix/trunk/gogo/command/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/command/pom.xml (original) +++ felix/trunk/gogo/command/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,22 +1,24 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> Modified: felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/package-info.java (original) +++ felix/trunk/gogo/command/src/main/java/org/apache/felix/gogo/command/package-info.java Fri Dec 21 20:22:59 2018 @@ -19,12 +19,14 @@ @org.osgi.annotation.bundle.Capability( namespace = "org.apache.felix.gogo", - name = "command.implementation" + name = "command.implementation", + version = "1.0.0" ) @org.osgi.annotation.bundle.Requirement( effective = "active", namespace = "org.apache.felix.gogo", - name = "runtime.implementation" + name = "runtime.implementation", + version = "1.0.0" ) package org.apache.felix.gogo.command; Modified: felix/trunk/gogo/gogo-parent/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/gogo-parent/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/gogo-parent/pom.xml (original) +++ felix/trunk/gogo/gogo-parent/pom.xml Fri Dec 21 20:22:59 2018 @@ -37,6 +37,14 @@ <url>https://svn.apache.org/repos/asf/felix/trunk/gogo/gogo-parent/</url> </scm> + <properties> + <animal.sniffer.skip>true</animal.sniffer.skip> + <felix.java.version>8</felix.java.version> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <bnd.version>4.1.0</bnd.version> + </properties> + <dependencyManagement> <dependencies> <dependency> @@ -76,6 +84,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>6.0.1</version> + <scope>runtime</scope> + </dependency> + <dependency> <groupId>org.easymock</groupId> <artifactId>easymock</artifactId> <version>3.4</version> @@ -90,14 +104,6 @@ </dependencies> </dependencyManagement> - <properties> - <animal.sniffer.skip>true</animal.sniffer.skip> - <felix.java.version>8</felix.java.version> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> - <bnd.version>4.1.0</bnd.version> - </properties> - <build> <pluginManagement> <plugins> Modified: felix/trunk/gogo/itest-jline/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-jline/pom.xml (original) +++ felix/trunk/gogo/itest-jline/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,3 +1,22 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -49,7 +68,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>6.0.1</version> </dependency> </dependencies> Modified: felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java (original) +++ felix/trunk/gogo/itest-jline/src/main/java/org/apache/felix/gogo/itest/jline/package-info.java Fri Dec 21 20:22:59 2018 @@ -20,6 +20,6 @@ @RequireGogo(JLINE) package org.apache.felix.gogo.itest.jline; -import static org.apache.felix.service.command.annotation.RequireGogo.JLINE; +import static org.apache.felix.service.command.annotations.RequireGogo.JLINE; -import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file +import org.apache.felix.service.command.annotations.RequireGogo; \ No newline at end of file Modified: felix/trunk/gogo/itest-shell/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-shell/pom.xml (original) +++ felix/trunk/gogo/itest-shell/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,3 +1,22 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -49,7 +68,6 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>6.0.1</version> </dependency> </dependencies> Modified: felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java (original) +++ felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java Fri Dec 21 20:22:59 2018 @@ -20,4 +20,4 @@ @RequireGogo package org.apache.felix.gogo.itest.shell; -import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file +import org.apache.felix.service.command.annotations.RequireGogo; \ No newline at end of file Modified: felix/trunk/gogo/jline/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/jline/pom.xml (original) +++ felix/trunk/gogo/jline/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file Modified: felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/package-info.java (original) +++ felix/trunk/gogo/jline/src/main/java/org/apache/felix/gogo/jline/package-info.java Fri Dec 21 20:22:59 2018 @@ -20,12 +20,14 @@ @org.osgi.annotation.bundle.Capability( attribute = "implementation.name=gogo.jline", namespace = "org.apache.felix.gogo", - name = "shell.implementation" + name = "shell.implementation", + version = "1.0.0" ) @Requirement( effective = "active", namespace = "org.apache.felix.gogo", - name = "command.implementation" + name = "command.implementation", + version = "1.0.0" ) package org.apache.felix.gogo.jline; Modified: felix/trunk/gogo/runtime/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/runtime/pom.xml (original) +++ felix/trunk/gogo/runtime/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,3 +1,4 @@ +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,13 +18,16 @@ under the License. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.felix</groupId> <artifactId>gogo-parent</artifactId> <version>5-SNAPSHOT</version> <relativePath>../gogo-parent/pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + <packaging>bundle</packaging> <name>Apache Felix Gogo Runtime</name> <artifactId>org.apache.felix.gogo.runtime</artifactId> @@ -42,6 +46,12 @@ </dependency> <dependency> <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.4.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> <artifactId>org.osgi.service.event</artifactId> </dependency> <dependency> @@ -69,12 +79,13 @@ <configuration> <instructions> <Export-Package> - org.apache.felix.service.command; version=1.0.0, - org.apache.felix.service.threadio; version=1.0.0, - org.apache.felix.gogo.runtime*; version=${project.version}, + org.apache.felix.gogo.runtime.*; version=${project.version}, + org.apache.felix.service.command, + org.apache.felix.service.command.annotations, + org.apache.felix.service.threadio, </Export-Package> <Import-Package> - org.osgi.service.event*; resolution:=optional, + org.osgi.service.event.*; resolution:=optional, * </Import-Package> </instructions> 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=1849492&r1=1849491&r2=1849492&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 Fri Dec 21 20:22:59 2018 @@ -16,6 +16,7 @@ * specific language governing permissions and limitations * under the License. */ + package org.apache.felix.gogo.runtime; import java.io.InputStream; @@ -41,8 +42,7 @@ import org.osgi.namespace.service.Servic @Capability( namespace = ServiceNamespace.SERVICE_NAMESPACE, - attribute = "objectClass='org.apache.felix.service.command.CommandProcessor'", - effective = "active" + attribute = "objectClass='org.apache.felix.service.command.CommandProcessor'" ) public class CommandProcessorImpl implements CommandProcessor { Modified: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/package-info.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/gogo/runtime/package-info.java Fri Dec 21 20:22:59 2018 @@ -19,12 +19,14 @@ @org.osgi.annotation.bundle.Capability( namespace = "org.apache.felix.gogo", - name = "runtime.implementation" + name = "runtime.implementation", + version = "1.0.0" ) @org.osgi.annotation.bundle.Requirement( effective = "active", namespace = "org.apache.felix.gogo", - name = "shell.implementation" + name = "shell.implementation", + version = "1.0.0" ) package org.apache.felix.gogo.runtime; 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=1849492&r1=1849491&r2=1849492&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 Fri Dec 21 20:22:59 2018 @@ -29,8 +29,7 @@ import org.osgi.namespace.service.Servic @Capability( namespace = ServiceNamespace.SERVICE_NAMESPACE, - attribute = "objectClass='org.apache.felix.service.threadio.ThreadIO'", - effective = "active" + attribute = "objectClass='org.apache.felix.service.threadio.ThreadIO'" ) public class ThreadIOImpl implements ThreadIO { Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/GogoCommand.java (from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/GogoCommand.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/GogoCommand.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/GogoCommand.java Fri Dec 21 20:22:59 2018 @@ -17,32 +17,32 @@ * under the License. */ -package org.apache.felix.service.command.annotation; +package org.apache.felix.service.command.annotations; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.CLASS; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import org.osgi.annotation.bundle.Attribute; -import org.osgi.annotation.bundle.Requirement; - -import static java.lang.annotation.RetentionPolicy.CLASS; +import org.osgi.service.component.annotations.ComponentPropertyType; -import java.lang.annotation.Documented; +@ComponentPropertyType +@RequireGogoWhiteboard +@Retention(CLASS) +@Target(TYPE) +public @interface GogoCommand { -import static java.lang.annotation.ElementType.*; + String PREFIX_ = "osgi.command."; -@Documented -@Retention(CLASS) -@Target({TYPE, PACKAGE}) -@Requirement( - effective = "active", - namespace = "org.apache.felix.gogo", - name = "shell.implementation" -) -public @interface RequireGogo { - String JLINE = "gogo.jline"; - String SHELL = "gogo.shell"; + /** + * @return the scope used to disambiguate command functions + */ + String scope(); + + /** + * @return the command functions provided by the service + */ + String[] function(); - @Attribute("implementation.name") - String value() default SHELL; } Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogo.java (from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogo.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogo.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogo.java Fri Dec 21 20:22:59 2018 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.felix.service.command.annotation; +package org.apache.felix.service.command.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -27,11 +27,8 @@ import org.osgi.annotation.bundle.Requir import static java.lang.annotation.RetentionPolicy.CLASS; -import java.lang.annotation.Documented; - import static java.lang.annotation.ElementType.*; -@Documented @Retention(CLASS) @Target({TYPE, PACKAGE}) @Requirement( Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogoWhiteboard.java (from r1849491, felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogoWhiteboard.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogoWhiteboard.java&p1=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotation/RequireGogo.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/RequireGogoWhiteboard.java Fri Dec 21 20:22:59 2018 @@ -17,32 +17,24 @@ * under the License. */ -package org.apache.felix.service.command.annotation; +package org.apache.felix.service.command.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import org.osgi.annotation.bundle.Attribute; import org.osgi.annotation.bundle.Requirement; import static java.lang.annotation.RetentionPolicy.CLASS; -import java.lang.annotation.Documented; - import static java.lang.annotation.ElementType.*; -@Documented @Retention(CLASS) @Target({TYPE, PACKAGE}) @Requirement( effective = "active", namespace = "org.apache.felix.gogo", - name = "shell.implementation" + name = "runtime.implementation", + version = "1.0.0" ) -public @interface RequireGogo { - String JLINE = "gogo.jline"; - String SHELL = "gogo.shell"; - - @Attribute("implementation.name") - String value() default SHELL; +public @interface RequireGogoWhiteboard { } Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/package-info.java (from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/package-info.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/package-info.java&p1=felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/annotations/package-info.java Fri Dec 21 20:22:59 2018 @@ -17,7 +17,7 @@ * under the License. */ -@RequireGogo -package org.apache.felix.gogo.itest.shell; [email protected] [email protected]("1.0.0") +package org.apache.felix.service.command.annotations; -import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/package-info.java (from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/package-info.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/package-info.java&p1=felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/command/package-info.java Fri Dec 21 20:22:59 2018 @@ -17,7 +17,7 @@ * under the License. */ -@RequireGogo -package org.apache.felix.gogo.itest.shell; [email protected] [email protected]("1.0.0") +package org.apache.felix.service.command; -import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file Copied: felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/package-info.java (from r1849491, felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java) URL: http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/package-info.java?p2=felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/package-info.java&p1=felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java&r1=1849491&r2=1849492&rev=1849492&view=diff ============================================================================== --- felix/trunk/gogo/itest-shell/src/main/java/org/apache/felix/gogo/itest/shell/package-info.java (original) +++ felix/trunk/gogo/runtime/src/main/java/org/apache/felix/service/threadio/package-info.java Fri Dec 21 20:22:59 2018 @@ -17,7 +17,7 @@ * under the License. */ -@RequireGogo -package org.apache.felix.gogo.itest.shell; [email protected] [email protected]("1.0.0") +package org.apache.felix.service.threadio; -import org.apache.felix.service.command.annotation.RequireGogo; \ No newline at end of file Modified: felix/trunk/gogo/shell/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/shell/pom.xml (original) +++ felix/trunk/gogo/shell/pom.xml Fri Dec 21 20:22:59 2018 @@ -1,21 +1,33 @@ -<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor - license agreements. See the NOTICE file distributed with this work for additional - information regarding copyright ownership. The ASF licenses this file to - you under the Apache License, Version 2.0 (the "License"); you may not use - this file except in compliance with the License. You may obtain a copy of - the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. --> +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. +--> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <parent> <groupId>org.apache.felix</groupId> <artifactId>gogo-parent</artifactId> <version>5-SNAPSHOT</version> <relativePath>../gogo-parent/pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> + <packaging>bundle</packaging> <name>Apache Felix Gogo Shell</name> <artifactId>org.apache.felix.gogo.shell</artifactId> Modified: felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/package-info.java URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/package-info.java?rev=1849492&r1=1849491&r2=1849492&view=diff ============================================================================== --- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/package-info.java (original) +++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/package-info.java Fri Dec 21 20:22:59 2018 @@ -20,12 +20,14 @@ @org.osgi.annotation.bundle.Capability( attribute = "implementation.name=gogo.shell", namespace = "org.apache.felix.gogo", - name = "shell.implementation" + name = "shell.implementation", + version = "1.0.0" ) @Requirement( effective = "active", namespace = "org.apache.felix.gogo", - name = "command.implementation" + name = "command.implementation", + version = "1.0.0" ) package org.apache.felix.gogo.shell;
