initial commit of m2e tooling example

rkrzewski · Dec 2, 2011 · dca89b9 · dca89b9
1 parent 2117c7e
commit dca89b9
Show file tree

Hide file tree

Showing 30 changed files with 489 additions and 0 deletions.
diff --git a/m2e/pl.caltha.osgi.m2e.parent/.project b/m2e/pl.caltha.osgi.m2e.parent/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pl.caltha.osgi.m2e.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/m2e/pl.caltha.osgi.m2e.parent/.settings/org.eclipse.m2e.core.prefs b/m2e/pl.caltha.osgi.m2e.parent/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/m2e/pl.caltha.osgi.m2e.parent/pom.xml b/m2e/pl.caltha.osgi.m2e.parent/pom.xml
@@ -0,0 +1,62 @@
+<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>
+  <groupId>pl.caltha.osgi.m2e</groupId>
+  <artifactId>parent</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>../pl.caltha.osgi.m2e.util</module>
+    <module>../pl.caltha.osgi.m2e.web</module>
+  </modules>
+
+  <properties>
+    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
+    <osgi-version-qualifier>${maven.build.timestamp}</osgi-version-qualifier>
+    <maven-bundle-plugin.version>2.3.6</maven-bundle-plugin.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>${maven-bundle-plugin.version}</version>
+          <extensions>true</extensions>
+          <configuration>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <properties>
+        <osgi-version-qualifier>qualifier</osgi-version-qualifier>
+      </properties>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <configuration>
+                <!-- PDE does not honour custom manifest location -->
+                <manifestLocation>META-INF</manifestLocation>
+              </configuration>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/m2e/pl.caltha.osgi.m2e.util/.classpath b/m2e/pl.caltha.osgi.m2e.util/.classpath
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/m2e/pl.caltha.osgi.m2e.util/.gitignore b/m2e/pl.caltha.osgi.m2e.util/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/m2e/pl.caltha.osgi.m2e.util/.project b/m2e/pl.caltha.osgi.m2e.util/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pl.caltha.osgi.m2e.util</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.jdt.core.prefs b/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.m2e.core.prefs b/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.pde.core.prefs b/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.wst.common.project.facet.core.xml b/m2e/pl.caltha.osgi.m2e.util/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="osgi.bundle" version="4.2"/>
+</faceted-project>
diff --git a/m2e/pl.caltha.osgi.m2e.util/META-INF/.gitignore b/m2e/pl.caltha.osgi.m2e.util/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/m2e/pl.caltha.osgi.m2e.util/build.properties b/m2e/pl.caltha.osgi.m2e.util/build.properties
@@ -0,0 +1,4 @@
+bin.includes = META-INF/,\
+               .
+source.. = src/main/java/
+output.. = target/classes/
diff --git a/m2e/pl.caltha.osgi.m2e.util/pom.xml b/m2e/pl.caltha.osgi.m2e.util/pom.xml
@@ -0,0 +1,25 @@
+<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>
+
+  <parent>
+    <groupId>pl.caltha.osgi.m2e</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pl.caltha.osgi.m2e.parent</relativePath>
+  </parent>
+
+  <artifactId>util</artifactId>
+  <packaging>bundle</packaging>
+
+  <build>
+    <finalName>${groupId}.${artifactId}-${version}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/m2e/pl.caltha.osgi.m2e.util/src/main/java/pl/caltha/osgi/m2e/util/Utility.java b/m2e/pl.caltha.osgi.m2e.util/src/main/java/pl/caltha/osgi/m2e/util/Utility.java
@@ -0,0 +1,7 @@
+package pl.caltha.osgi.m2e.util;
+
+public class Utility {
+	public String hello() {
+		return "Hello from a class in utility bundle!";
+	}
+}
diff --git a/m2e/pl.caltha.osgi.m2e.web/.classpath b/m2e/pl.caltha.osgi.m2e.web/.classpath
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/m2e/pl.caltha.osgi.m2e.web/.gitignore b/m2e/pl.caltha.osgi.m2e.web/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/m2e/pl.caltha.osgi.m2e.web/.project b/m2e/pl.caltha.osgi.m2e.web/.project
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pl.caltha.osgi.m2e.web</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.jdt.core.prefs b/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.m2e.core.prefs b/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.pde.core.prefs b/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
+BUNDLE_ROOT_PATH=src/main/webapp
diff --git a/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.wst.common.project.facet.core.xml b/m2e/pl.caltha.osgi.m2e.web/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="osgi.bundle" version="4.2"/>
+</faceted-project>
diff --git a/m2e/pl.caltha.osgi.m2e.web/pom.xml b/m2e/pl.caltha.osgi.m2e.web/pom.xml
@@ -0,0 +1,46 @@
+<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>
+
+  <parent>
+    <groupId>pl.caltha.osgi.m2e</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <relativePath>../pl.caltha.osgi.m2e.parent</relativePath>
+  </parent>
+
+  <artifactId>web</artifactId>
+  <packaging>bundle</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>pl.caltha.test</groupId>
+      <artifactId>util-bundle</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>${groupId}.${artifactId}-${version}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <manifestLocation>src/main/webapp/META-INF</manifestLocation>
+          <instructions>
+            <Require-Bundle>pl.caltha.osgi.m2e.util;bundle-version="0.0.1"</Require-Bundle>          
+            <_wab>src/main/webapp</_wab>
+            <Bundle-Classpath>WEB-INF/classes/</Bundle-Classpath>
+            <Web-ContextPath>/m2e</Web-ContextPath>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/m2e/pl.caltha.osgi.m2e.web/src/main/java/pl/caltha/osgi/m2e/web/Servlet.java b/m2e/pl.caltha.osgi.m2e.web/src/main/java/pl/caltha/osgi/m2e/web/Servlet.java
@@ -0,0 +1,26 @@
+package pl.caltha.osgi.m2e.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import pl.caltha.osgi.m2e.util.Utility;
+
+@WebServlet("/Servlet")
+public class Servlet extends HttpServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		PrintWriter pw = response.getWriter();
+		pw.append("Hello from a Servlet!\n");
+		Utility util = new Utility();
+		pw.append(util.hello());
+		pw.close();
+	}
+}
diff --git a/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/META-INF/.gitignore b/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/META-INF/.gitignore
@@ -0,0 +1 @@
+/MANIFEST.MF
diff --git a/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/build.properties b/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/build.properties
@@ -0,0 +1,5 @@
+bin.includes = META-INF/,\
+               WEB-INF/,\
+               index.html
+source.WEB-INF/classes/ = ../java/
+output.WEB-INF/classes/ = WEB-INF/classes/
diff --git a/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/index.html b/m2e/pl.caltha.osgi.m2e.web/src/main/webapp/index.html
@@ -0,0 +1,11 @@
+<html>
+  <head>
+    <title>OSGi web test - maven-bundle-plugin tooling</title>
+  </head>
+  <body>
+   <p>
+     Hello world from OSGi web application!<br/>
+     <a href="Servlet">click me</a>
+   </p>
+  </body>
+</html>