Author: cziegeler
Date: Wed Nov 28 15:44:22 2012
New Revision: 1414763
URL: http://svn.apache.org/viewvc?rev=1414763&view=rev
Log:
FELIX-3739 : scr-plugin: "Annotated method {0} not found" . Apply patch from
Robert Munteanu
Added:
felix/trunk/scrplugin/maven-scr-plugin/src/it/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
(with props)
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
(with props)
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
(with props)
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
(with props)
felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml (with props)
Modified:
felix/trunk/scrplugin/maven-scr-plugin/pom.xml
Modified: felix/trunk/scrplugin/maven-scr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/pom.xml?rev=1414763&r1=1414762&r2=1414763&view=diff
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/pom.xml (original)
+++ felix/trunk/scrplugin/maven-scr-plugin/pom.xml Wed Nov 28 15:44:22 2012
@@ -84,6 +84,29 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>1.7</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <!--
http://maven.apache.org/plugins/maven-invoker-plugin/examples/fast-use.html -->
+ <settingsFile>src/it/settings.xml</settingsFile>
+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Added: felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml?rev=1414763&view=auto
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml (added)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml Wed
Nov 28 15:44:22 2012
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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>
+ <groupId>org.apache.felix.scr</groupId>
+ <artifactId>basic-built-it</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>basic-build-it</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>generate-scr-descriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.3.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java?rev=1414763&view=auto
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
(added)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
Wed Nov 28 15:44:22 2012
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr;
+
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.sling.api.adapter.AdapterManager;
+
+/**
+ * Just a simple DS Component
+ */
+@Component(metatype=true)
+@Service
+public class SimpleDSComponent implements Runnable {
+
+ @Property(value="Simple DS Component")
+ public static final String PN_FRIENDLY_NAME = "friendly_name";
+
+ @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY)
+ private AdapterManager adapterManager;
+
+
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private BundleContext bundleContext;
+
+ public void run() {
+ logger.info("Running...");
+ }
+
+ protected void activate(ComponentContext ctx) {
+ this.bundleContext = ctx.getBundleContext();
+ }
+
+ protected void deactivate() {
+ this.bundleContext = null;
+ }
+
+}
+
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/basic-build-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml?rev=1414763&view=auto
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
(added)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
Wed Nov 28 15:44:22 2012
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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>
+ <groupId>org.apache.felix.scr</groupId>
+ <artifactId>external-annotations-it</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>basic-build-it</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>generate-scr-descriptor</id>
+ <goals>
+ <goal>scr</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>2.3.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.10</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java?rev=1414763&view=auto
==============================================================================
---
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
(added)
+++
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
Wed Nov 28 15:44:22 2012
@@ -0,0 +1,71 @@
+/*
+ * 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.
+ */
+package org.apache.felix.scr;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.Service;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.sling.api.adapter.AdapterManager;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Just a simple DS Component
+ */
+@Component(metatype=true)
+@Service
+public class SimpleDSComponent implements Runnable {
+
+ private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ private BundleContext bundleContext;
+
+ @Nonnull
+ public SimpleDSComponent() {
+
+ }
+
+ @Nonnull
+ public SimpleDSComponent(String m) {
+
+ }
+
+ @Nonnull
+ public void run() {
+ logger.info("Running...");
+ }
+
+ protected void activate(ComponentContext ctx) {
+ this.bundleContext = ctx.getBundleContext();
+ }
+
+ protected void deactivate() {
+ this.bundleContext = null;
+ }
+
+}
+
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange:
felix/trunk/scrplugin/maven-scr-plugin/src/it/external-annotations-it/src/main/java/org/apache/felix/scr/SimpleDSComponent.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml?rev=1414763&view=auto
==============================================================================
--- felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml (added)
+++ felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml Wed Nov 28
15:44:22 2012
@@ -0,0 +1,53 @@
+<?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.
+-->
+<settings>
+ <profiles>
+ <profile>
+ <id>it-repo</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <repositories>
+ <repository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>local.central</id>
+ <url>@localRepositoryUrl@</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+</settings>
\ No newline at end of file
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: felix/trunk/scrplugin/maven-scr-plugin/src/it/settings.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
