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 2011/06/14 22:53:06 UTC

svn commit: r1135789 - in /myfaces/extensions/cdi/trunk/bundles: jsf12-osgi/ jsf12-osgi/pom.xml jsf20-osgi/ jsf20-osgi/pom.xml pom.xml

Author: jakobk
Date: Tue Jun 14 20:53:06 2011
New Revision: 1135789

URL: http://svn.apache.org/viewvc?rev=1135789&view=rev
Log:
EXTCDI-202 simple OSGi support

Added:
    myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/   (with props)
    myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/pom.xml
    myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/   (with props)
    myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/pom.xml
Modified:
    myfaces/extensions/cdi/trunk/bundles/pom.xml

Propchange: myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 14 20:53:06 2011
@@ -0,0 +1,12 @@
+target
+.metadata
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.git
+.gitignore
+.externalToolBuilders
+maven-eclipse.xml

Added: myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/pom.xml?rev=1135789&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/pom.xml (added)
+++ myfaces/extensions/cdi/trunk/bundles/jsf12-osgi/pom.xml Tue Jun 14 20:53:06 2011
@@ -0,0 +1,76 @@
+<?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 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>
+
+    <parent>
+        <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+        <artifactId>bundle-project</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+    <artifactId>myfaces-extcdi-bundle-jsf12-osgi</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>MyFaces Extensions-CDI OSGi-Bundle for JSF 1.2</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.4</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>org.apache.myfaces.extensions.cdi.bundles.jsf12</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>
+                            org.apache.myfaces.extensions.cdi.*;version="${project.version}"
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.myfaces.extensions.cdi.*,
+                            *
+                        </Import-Package>
+                        <Embed-Dependency>*;type=!pom;inline=true</Embed-Dependency>
+                    </instructions>
+
+                    <!-- exclude the default dependencies (see CODI parent) from the bundle -->
+                    <excludeDependencies>testng,geronimo-atinject_1.0_spec,geronimo-jcdi_1.0_spec,geronimo-interceptor_1.1_spec</excludeDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+            <artifactId>myfaces-extcdi-bundle-jsf12</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 14 20:53:06 2011
@@ -0,0 +1,12 @@
+target
+.metadata
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.git
+.gitignore
+.externalToolBuilders
+maven-eclipse.xml

Added: myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/pom.xml?rev=1135789&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/pom.xml (added)
+++ myfaces/extensions/cdi/trunk/bundles/jsf20-osgi/pom.xml Tue Jun 14 20:53:06 2011
@@ -0,0 +1,76 @@
+<?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 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>
+
+    <parent>
+        <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+        <artifactId>bundle-project</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+    <artifactId>myfaces-extcdi-bundle-jsf20-osgi</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+
+    <name>MyFaces Extensions-CDI OSGi-Bundle for JSF 2.0</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.3.4</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>org.apache.myfaces.extensions.cdi.bundles.jsf20</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>
+                            org.apache.myfaces.extensions.cdi.*;version="${project.version}"
+                        </Export-Package>
+                        <Import-Package>
+                            !org.apache.myfaces.extensions.cdi.*,
+                            *
+                        </Import-Package>
+                        <Embed-Dependency>*;type=!pom;inline=true</Embed-Dependency>
+                    </instructions>
+
+                    <!-- exclude the default dependencies (see CODI parent) from the bundle -->
+                    <excludeDependencies>testng,geronimo-atinject_1.0_spec,geronimo-jcdi_1.0_spec,geronimo-interceptor_1.1_spec</excludeDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
+            <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Modified: myfaces/extensions/cdi/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/pom.xml?rev=1135789&r1=1135788&r2=1135789&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/bundles/pom.xml Tue Jun 14 20:53:06 2011
@@ -36,6 +36,8 @@
     <modules>
         <module>jsf12</module>
         <module>jsf20</module>
+        <module>jsf12-osgi</module>
+        <module>jsf20-osgi</module>
         <module>alternative-configuration</module>
     </modules>