kurtharriger · jsaivikas007 · Jan 18, 2008 · Jan 19, 2008 · Jan 21, 2008 · Jan 24, 2008
diff --git a/annotation/pom.xml b/annotation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>spring-osgi</artifactId>
     <groupId>org.springframework.osgi</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.osgi</groupId>
@@ -19,6 +19,11 @@
 	<javadoc.loc>${basedir}/../docs/src/javadoc</javadoc.loc>
 	<spring.osgi.export.pkg>org.springframework.osgi.extensions.annotation</spring.osgi.export.pkg>
 	<spring.osgi.symbolic.name>${symName.prefix}.extensions.annotations</spring.osgi.symbolic.name>
+	<spring.osgi.import.pkg>
+	org.springframework.osgi*;version=${spring.osgi.import.version},
+	org.springframework*;version=${spring.base.version},
+	*
+	</spring.osgi.import.pkg>
   </properties>
 
   <dependencies>

diff --git a/bundle-archetype/pom.xml b/bundle-archetype/pom.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<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">
   <parent>
     <artifactId>spring-osgi</artifactId>
     <groupId>org.springframework.osgi</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.osgi</groupId>
   <artifactId>spring-osgi-bundle-archetype</artifactId>
   <packaging>maven-plugin</packaging>
   <name>Spring OSGi Archetype</name>
+  <description>Spring OSGi Maven2 Archetype</description>
   <url>http://www.springframework.org/osgi</url>
 
-
- <build>
+  <build>
     <resources>
-
       <resource>
         <filtering>false</filtering>
         <directory>src/main/resources</directory>
       </resource>
-
     </resources>
   </build>
 </project>
diff --git a/bundle-archetype/src/main/resources/META-INF/archetype.xml b/bundle-archetype/src/main/resources/META-INF/archetype.xml
@@ -1,25 +1,25 @@
 <archetype>
-  <id>spring-osgi-bundle-artifact</id>
+  <id>spring-osgi-bundle-archetype</id>
   <sources>
     <source>src/main/java/Bean.java</source>
     <source>src/main/java/impl/BeanImpl.java</source>
   </sources>
   <resources>
-    <!--
-    <resource>META-INF/MANIFEST.MF</resource>
-    -->
+    <resource>META-INF/readme.txt</resource>
     <resource>readme.txt</resource>
     <resource>src/main/resources/META-INF/spring/bundle-context.xml</resource>
     <resource>src/main/resources/META-INF/spring/bundle-context-osgi.xml</resource>
+    <resource>src/main/resources/log4j.properties</resource>
     <resource>.classpath</resource>
     <resource>.project</resource>
     <resource>build.properties</resource>
   </resources>
   <testSources>
     <source>src/test/java/impl/BeanImplTest.java</source>
     <source>src/test/java/impl/BeanIntegrationTest.java</source>
+    <source>src/test/java/impl/BeanOsgiIntegrationTest.java</source>
   </testSources>
   <testResources>
-    <resource>src/test/resources/readme.txt</resource>
+    <resource>src/test/resources/log4j.properties</resource>
   </testResources>
 </archetype>
diff --git a/bundle-archetype/src/main/resources/archetype-resources/.classpath b/bundle-archetype/src/main/resources/archetype-resources/.classpath
@@ -2,9 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" path="src/main/resources/META-INF"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
-	<classpathentry output="target/test-classes" kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
@@ -13,5 +12,15 @@
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.1/spring-context-2.5.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.1/spring-beans-2.5.1.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl104-over-slf4j/1.4.3/jcl104-over-slf4j-1.4.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/log4j.osgi/1.2.15-SNAPSHOT/log4j.osgi-1.2.15-SNAPSHOT.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/eclipse/osgi/org.eclipse.osgi/3.2.2/org.eclipse.osgi-3.2.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/spring-osgi-test/1.0.3/spring-osgi-test-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/spring-osgi-mock/1.0.3/spring-osgi-mock-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/spring-osgi-core/1.0.3/spring-osgi-core-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/spring-osgi-extender/1.0.3/spring-osgi-extender-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/spring-osgi-io/1.0.3/spring-osgi-io-1.0.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/org/springframework/osgi/asm.osgi/2.2.3-SNAPSHOT/asm.osgi-2.2.3-SNAPSHOT.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/bundle-archetype/src/main/resources/archetype-resources/META-INF/readme.txt b/bundle-archetype/src/main/resources/archetype-resources/META-INF/readme.txt
@@ -0,0 +1,6 @@
+To facilitate OSGi bundle manifest generation, the archetype uses Felix maven plugin.
+The manifest will be generated when building the project. To trigger this, run:
+
+mvn package
+
+Please see http://felix.apache.org/site/maven-bundle-plugin-bnd.html for more information.
diff --git a/bundle-archetype/src/main/resources/archetype-resources/pom.xml b/bundle-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
@@ -11,21 +12,12 @@
   <properties>
 	<slf4j.version>1.4.3</slf4j.version>
 	<spring.maven.artifact.version>2.5.1</spring.maven.artifact.version>
+	<spring.osgi.version>1.0.3</spring.osgi.version>
+	<equinox.ver>3.2.2</equinox.ver>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.springframework.osgi</groupId>
-      <artifactId>junit.osgi</artifactId>
-      <version>3.8.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring.maven.artifact.version}</version>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
@@ -59,32 +51,120 @@
       <artifactId>slf4j-log4j12</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
+
 
     <dependency>
      <groupId>org.osgi</groupId>
      <artifactId>org.osgi.core</artifactId>
      <version>4.0</version>
     </dependency>
+
+	<!-- test scoped dependencies -->
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>junit.osgi</artifactId>
+      <version>3.8.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.maven.artifact.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+	  <groupId>org.springframework.osgi</groupId>
+	  <artifactId>spring-osgi-test</artifactId>
+	  <version>${spring.osgi.version}</version>
+	  <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	  <groupId>org.springframework.osgi</groupId>
+	  <artifactId>spring-osgi-annotation</artifactId>
+	  <version>${spring.osgi.version}</version>
+	  <scope>test</scope>
+	</dependency>
+
+	<dependency>
+	  <groupId>org.springframework.osgi</groupId>
+	  <artifactId>aopalliance.osgi</artifactId>
+	  <version>1.0-SNAPSHOT</version>
+	  <scope>test</scope>
+	</dependency>
+
+	<!-- Equinox OSGi platform -->
+    <dependency>
+      <groupId>org.eclipse.osgi</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${equinox.ver}</version>
+      <type>jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.osgi</groupId>
+      <artifactId>log4j.osgi</artifactId>
+      <version>1.2.15-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>    
+
   </dependencies>
 
   <!-- for packaging as an OSGi bundle, we use the maven-bundle-plugin -->
 
   <!-- see http://felix.apache.org/site/maven-bundle-plugin-bnd.html for more info -->
   <build>
+    <resources>
+      <!-- standard Maven folder -->
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <!-- plus root folder -->
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+          <include>META-INF/*</include>
+        </includes>
+      </resource>
+    </resources>  
+
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <version>1.0.0</version>
         <configuration>
+		   <manifestLocation>META-INF</manifestLocation>
            <instructions>
-               <manifestLocation>META-INF</manifestLocation>
-               <Export-Package>${package}*</Export-Package>
+               <Export-Package>!${package}.impl,${package}*</Export-Package>
                <Import-Package>*</Import-Package>
+               <!-- 
+                  add ,plugin.xml if it's present i.e.
+                  src/main/resources,plugin.xml
+               -->
+               <Include-Resource>src/main/resources</Include-Resource>
            </instructions>
         </configuration>
       </plugin>
+
+      <!-- generate manifest automatically once the classes are processed -->
+	  <plugin>   
+		<groupId>org.apache.felix</groupId>
+		<artifactId>maven-bundle-plugin</artifactId>
+		<executions>
+		  <execution>
+			<id>bundle-manifest</id>
+			<phase>process-classes</phase>
+			<goals>    
+			  <goal>manifest</goal>
+			</goals>   
+		  </execution>
+		</executions>
+	   </plugin>      
     </plugins>
   </build>
 

diff --git a/bundle-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/bundle-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
@@ -0,0 +1,8 @@
+log4j.rootCategory=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.threshold=TRACE
+
+#log4j.logger.org.springframework.osgi=DEBUG
+#log4j.logger.org.springframework=DEBUG
diff --git a/...hetype/src/main/resources/archetype-resources/src/test/java/impl/BeanIntegrationTest.java b/...hetype/src/main/resources/archetype-resources/src/test/java/impl/BeanIntegrationTest.java
@@ -4,9 +4,8 @@
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**
- * Integration test the bundle locally (outside of OSGi).
- * Use AbstractOsgiTests and a separate integration test project
- * for testing inside of OSGi.
+ * Local integration test (outside of OSGi).
+ * @see BeanOsgiIntegrationTest for integration test inside OSGi.
  */
 public class BeanIntegrationTest extends AbstractDependencyInjectionSpringContextTests {
 

diff --git a/...pe/src/main/resources/archetype-resources/src/test/java/impl/BeanOsgiIntegrationTest.java b/...pe/src/main/resources/archetype-resources/src/test/java/impl/BeanOsgiIntegrationTest.java
@@ -0,0 +1,19 @@
+package ${package}.impl;
+
+import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
+
+/**
+ * OSGi integration test (inside OSGi).
+ * @see AbstractConfigurableBundleCreatorTests
+ */
+public class BeanOsgiIntegrationTest extends AbstractConfigurableBundleCreatorTests {
+
+	protected String[] getConfigLocations() {
+	  return new String[] {"META-INF/spring/*.xml"};
+	}
+
+	public void testOsgiBundleContext() {
+	  assertNotNull(bundleContext);
+	}
+
+}
diff --git a/bundle-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/bundle-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties
@@ -0,0 +1,8 @@
+log4j.rootCategory=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%t %p [%c] - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.threshold=TRACE
+
+#log4j.logger.org.springframework.osgi=DEBUG
+#log4j.logger.org.springframework=DEBUG
diff --git a/bundle-archetype/src/main/resources/archetype-resources/src/test/resources/readme.txt b/bundle-archetype/src/main/resources/archetype-resources/src/test/resources/readme.txt