You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/11/26 11:25:58 UTC
svn commit: r1039301 - in /myfaces/core/trunk: bundle/ bundle/pom.xml pom.xml
Author: jakobk
Date: Fri Nov 26 10:25:58 2010
New Revision: 1039301
URL: http://svn.apache.org/viewvc?rev=1039301&view=rev
Log:
MYFACES-2976 Support hiding myfaces impl classes in osgi, and provide a single osgi bundle for api + impl (provide OSGi bundle module)
Added:
myfaces/core/trunk/bundle/ (with props)
myfaces/core/trunk/bundle/pom.xml
Modified:
myfaces/core/trunk/pom.xml
Propchange: myfaces/core/trunk/bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Nov 26 10:25:58 2010
@@ -0,0 +1,12 @@
+target
+.metadata
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.git
+.gitignore
+.externalToolBuilders
+maven-eclipse.xml
Added: myfaces/core/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/bundle/pom.xml?rev=1039301&view=auto
==============================================================================
--- myfaces/core/trunk/bundle/pom.xml (added)
+++ myfaces/core/trunk/bundle/pom.xml Fri Nov 26 10:25:58 2010
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-core-project</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>myfaces-bundle</artifactId>
+ <name>Apache MyFaces JSF-2.0 Core OSGi Bundle</name>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.1.0</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.apache.myfaces.core.bundle</Bundle-SymbolicName>
+ <Build-Jdk>${java.version}</Build-Jdk>
+ <Implementation-Title>${project.name}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
+ <Export-Package>
+ javax.faces.*;version="${project.version}",
+ org.apache.myfaces.config.annotation;version="${project.version}",
+ org.apache.myfaces.shared_impl.webapp.webxml;version="${project.version}",
+ org.apache.myfaces.spi;version="${project.version}",
+ org.apache.myfaces.webapp;version="${project.version}",
+ org.apache.myfaces.taglib.*;version="${project.version}",
+ org.apache.myfaces.ee6;version="${project.version}",
+ org.apache.myfaces.config.element;version="${project.version}",
+ org.apache.myfaces.config.impl.digester.elements;version="${project.version}"
+ </Export-Package>
+ <Import-Package>
+ !org.apache.myfaces.*,
+ com.google.inject;version="[1.0.0, 2.0.0)";resolution:=optional,
+ javax.annotation,
+ javax.crypto,
+ javax.crypto.spec,
+ javax.ejb;resolution:=optional,
+ javax.el;version="[1.0.0, 3.0.0)",
+ javax.naming,
+ javax.persistence;version="[1.0.0, 2.1)";resolution:=optional,
+ javax.portlet;version="[1.0.0, 2.1)";resolution:=optional,
+ javax.servlet;version="[2.5.0, 3.1)",
+ javax.servlet.http;version="[2.5.0, 3.1)",
+ javax.servlet.jsp;version="[2.1.0, 3.1)",
+ javax.servlet.jsp.jstl.core;version="[1.1.2, 2.0.0)",
+ javax.servlet.jsp.tagext;version="[2.1.0, 3.1)",
+ javax.servlet.annotation;resolution:=optional,
+ javax.xml.parsers,
+ org.apache;resolution:=optional,
+ org.apache.commons.beanutils;version="[1.8.3, 2.0.0)",
+ org.apache.commons.codec.binary;version="[1.3.0, 2.0.0)",
+ org.apache.commons.collections.map;version="[3.2.0, 4.0.0)",
+ org.apache.commons.digester;version="[1.8.0, 2.0.0)",
+ org.apache.commons.discovery;version="[0.4.0, 1.0.0)",
+ org.apache.commons.discovery.resource;version="[0.4.0, 1.0.0)",
+ org.apache.commons.discovery.resource.names;version="[0.4.0, 1.0.0)",
+ org.apache.commons.discovery.tools;version="[0.4.0, 1.0.0)",
+ org.apache.commons.logging;version="[1.1.1, 2.0.0)",
+ org.w3c.dom,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ org.apache.jasper.compiler;resolution:=optional,
+ org.apache.jasper.el;resolution:=optional,
+ org.apache.el;resolution:=optional,
+ org.apache.tomcat;resolution:=optional,
+ *
+ </Import-Package>
+ <Embed-Dependency>*;type=!pom;inline=true</Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
+
\ No newline at end of file
Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/pom.xml?rev=1039301&r1=1039300&r2=1039301&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Fri Nov 26 10:25:58 2010
@@ -50,6 +50,7 @@
<module>api</module>
<module>implee6</module>
<module>impl</module>
+ <module>bundle</module>
</modules>
<repositories>
<repository>