tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1222984 - in /tomcat/sandbox/trunk-mvn-build: pom.xml tomcat-el-api/pom.xml tomcat-jasper-el/pom.xml tomcat-jasper/pom.xml tomcat-servlet-api/pom.xml
Date Sat, 24 Dec 2011 15:24:46 GMT
Author: olamy
Date: Sat Dec 24 15:24:45 2011
New Revision: 1222984

URL: http://svn.apache.org/viewvc?rev=1222984&view=rev
Log:
start working on osgi metadatas

Modified:
    tomcat/sandbox/trunk-mvn-build/pom.xml
    tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
    tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml
    tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml
    tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml

Modified: tomcat/sandbox/trunk-mvn-build/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/pom.xml?rev=1222984&r1=1222983&r2=1222984&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/pom.xml Sat Dec 24 15:24:45 2011
@@ -133,6 +133,11 @@
           <artifactId>maven-bundle-plugin</artifactId>
           <version>2.3.6</version>
           <extensions>true</extensions>
+          <configuration>
+            <instructions>
+              <Bundle-DocURL>http://tomcat.apache.org</Bundle-DocURL>
+            </instructions>
+          </configuration>
         </plugin>
 
         <plugin>

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml?rev=1222984&r1=1222983&r2=1222984&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-el-api/pom.xml Sat Dec 24 15:24:45 2011
@@ -24,6 +24,8 @@
     <artifactId>tomcat-parent</artifactId>
     <version>7.0.24-SNAPSHOT</version>
   </parent>
+
+  <packaging>bundle</packaging>
   <artifactId>tomcat-el-api</artifactId>
 
   <description>Expression language package</description>
@@ -41,6 +43,24 @@
         </includes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>javax.el</Bundle-SymbolicName>
+            <Bundle-Version>2.2.0</Bundle-Version>
+            <Export-Package>
+              javax.el;version=2.2.0
+            </Export-Package>
+            <Bundle-RequiredExecutionEnvironment>
+              J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3
+            </Bundle-RequiredExecutionEnvironment>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
   <!--

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml?rev=1222984&r1=1222983&r2=1222984&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-jasper-el/pom.xml Sat Dec 24 15:24:45 2011
@@ -24,6 +24,8 @@
     <artifactId>tomcat-parent</artifactId>
     <version>7.0.24-SNAPSHOT</version>
   </parent>
+
+  <packaging>bundle</packaging>
   <artifactId>tomcat-jasper-el</artifactId>
 
   <description>Jasper Expression Language Impl</description>
@@ -35,6 +37,29 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.el</Bundle-SymbolicName>
+            <Bundle-Version>${project.version}</Bundle-Version>
+            <Export-Package>
+              org.apache.el;version=${project.version}
+            </Export-Package>
+            <Import-Package>
+              javax.el;version="2.2"
+            </Import-Package>
+            <Bundle-RequiredExecutionEnvironment>
+              J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3
+            </Bundle-RequiredExecutionEnvironment>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <!--
   <build>
     <plugins>

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml?rev=1222984&r1=1222983&r2=1222984&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-jasper/pom.xml Sat Dec 24 15:24:45 2011
@@ -25,6 +25,7 @@
     <version>7.0.24-SNAPSHOT</version>
   </parent>
   <artifactId>tomcat-jasper</artifactId>
+  <packaging>bundle</packaging>
 
   <description>Tomcats JSP Parser</description>
   <dependencies>
@@ -99,6 +100,49 @@
       </resource>
     </resources>
 
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.jasper</Bundle-SymbolicName>
+            <Bundle-Version>${project.version}</Bundle-Version>
+            <Export-Package>
+              org.apache.jasper;version=${project.version},org.apache.jasper.compiler;version=${project.version},
+              org.apache.jasper.compiler.tagplugin;version=${project.version},
+              org.apache.jasper.resources;version=${project.version},org.apache.jasper.runtime;version=${project.version},
+              org.apache.jasper.security;version=${project.version},org.apache.jasper.servlet;version=${project.version},
+              org.apache.jasper.tagplugins.jstl;version=${project.version},org.apache.jasper.tagplugins.jstl.core;version=${project.version},
+              org.apache.jasper.util;version=${project.version},org.apache.jasper.xmlparser;version=${project.version}
+            </Export-Package>
+            <Import-Package>
+              javax.servlet;version="[2.4.0, 3.0.0]",javax.servlet.http;version="[2.4.0,
3.0.0]",
+              javax.servlet.descriptor;version="[2.4.0, 3.0.0]",
+              javax.servlet.jsp;version="[2.0.0, 2.2.0]",javax.servlet.jsp.el;version="[2.0.0,
2.2.0]",
+              javax.servlet.jsp.resources;version="[2.0.0, 2.2.0]",javax.servlet.jsp.tagext;version="[2.0.0,
2.2.0]",
+              javax.servlet.resources;version="[2.4.0, 3.0.0]",javax.xml.parsers,org.apache.commons.el;version="[1.0.0,2.0.0)",
+              org.apache.commons.logging;version="[1.0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,
+              org.apache.tools.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolution:=optional,
+              org.apache.tools.ant.util;resolution:=optional,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,org.apache.tomcat;version=${project.version},
+              org.apache.juli.logging;version=${project.version},javax.el;version="2.2.0",org.eclipse.jdt.internal.compiler,
+              org.eclipse.jdt.internal.compiler.parser,org.eclipse.jdt.internal.compiler.parser.diagnose,
+              org.eclipse.jdt.internal.compiler.flow,org.eclipse.jdt.internal.compiler.util,
+              org.eclipse.jdt.internal.compiler.impl,org.eclipse.jdt.internal.compiler.lookup,
+              org.eclipse.jdt.internal.compiler.codegen,org.eclipse.jdt.internal.compiler.batch,
+              org.eclipse.jdt.internal.compiler.classfmt,org.eclipse.jdt.internal.compiler.ast,
+              org.eclipse.jdt.internal.compiler.problem,org.eclipse.jdt.internal.compiler.env,
+              org.eclipse.jdt.internal.core.util,org.eclipse.jdt.core.compiler,
+              org.apache.tomcat.util.scan
+            </Import-Package>
+            <Bundle-RequiredExecutionEnvironment>
+              J2SE-1.4,CDC-1.0/Foundation-1.0,J2SE-1.3
+            </Bundle-RequiredExecutionEnvironment>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+
     <!--
     <resources>
       <resource>

Modified: tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml?rev=1222984&r1=1222983&r2=1222984&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-servlet-api/pom.xml Sat Dec 24 15:24:45 2011
@@ -57,14 +57,14 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.apache.tomcat.servlet.api</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
+            <Bundle-SymbolicName>javax.servlet</Bundle-SymbolicName>
+            <Bundle-Version>3.0</Bundle-Version>
             <Export-Package>
               javax.servlet*;version=3.0;-split-package:=merge-first
             </Export-Package>
-            <Import-Package>
-
-            </Import-Package>
+            <Bundle-RequiredExecutionEnvironment>
+              CDC-1.1/Foundation-1.1,J2SE-1.4
+            </Bundle-RequiredExecutionEnvironment>
           </instructions>
         </configuration>
       </plugin>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message