Shawn,

The 1.0.0-SNAPSHOT version of openwebbeans is not published to the
repository and therefore it is causing trunk build problems. But I'm
not really sure why we need these wrappers in Geronimo. We should be
able to work the the openwebbeans group and bundelize their artifacts.

Jarek

On Mon, Apr 19, 2010 at 7:07 AM,  <genspr...@apache.org> wrote:
> Author: genspring
> Date: Mon Apr 19 11:07:31 2010
> New Revision: 935524
>
> URL: http://svn.apache.org/viewvc?rev=935524&view=rev
> Log:
> GERONIMO-5219 Java EE Injection annotation scanning for 299 beans
>
> Adding the related openwebbeans bundles wrappers to support the owb modules.
>
> Added:
>    geronimo/server/trunk/framework/bundles/openwebbeans-impl/
>    geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml   (with 
> props)
>    geronimo/server/trunk/framework/bundles/openwebbeans-jsf/
>    geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml   (with 
> props)
>    geronimo/server/trunk/framework/bundles/openwebbeans-spi/
>    geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml   (with 
> props)
>    geronimo/server/trunk/framework/bundles/openwebbeans-web/
>    geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml   (with 
> props)
>    geronimo/server/trunk/framework/bundles/scannotation/
>    geronimo/server/trunk/framework/bundles/scannotation/pom.xml   (with props)
> Modified:
>    geronimo/server/trunk/framework/bundles/pom.xml
>
> Added: geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml?rev=935524&view=auto
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml (added)
> +++ geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml Mon Apr 
> 19 11:07:31 2010
> @@ -0,0 +1,74 @@
> +<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";>
> +
> +    <!--
> +
> +        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.
> +    -->
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.framework</groupId>
> +        <artifactId>framework</artifactId>
> +        <version>3.0-SNAPSHOT</version>
> +    </parent>
> +
> +    <groupId>org.apache.geronimo.bundles</groupId>
> +    <artifactId>openwebbeans-impl</artifactId>
> +    <version>${pkgVersion}${bundleVersion}</version>
> +    <packaging>bundle</packaging>
> +    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
> +    <description>
> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
> +    </description>
> +
> +    <properties>
> +        <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
> +        <pkgArtifactId>openwebbeans-impl</pkgArtifactId>
> +        <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>${pkgGroupId}</groupId>
> +            <artifactId>${pkgArtifactId}</artifactId>
> +            <version>${pkgVersion}</version>
> +            <scope>provided</scope>
> +        </dependency>
> +    </dependencies>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.felix</groupId>
> +                <artifactId>maven-bundle-plugin</artifactId>
> +                <configuration>
> +                    <instructions>
> +                        <Export-Package>
> +                        org.apache.webbeans*;version=${pkgVersion}
> +                        </Export-Package>
> +                        <Import-Package>org.apache.log4j; 
> version="[1.2,1.3)"; provider=paxlogging,*</Import-Package>
> +                        <Include-Resource>
> +                     
> �...@${pkgartifactid}-${pkgversion}.jar!/META-INF/faces-config.xml,
> +                     
> �...@${pkgartifactid}-${pkgversion}.jar!/META-INF/openwebbeans/openwebbeans-default.properties
> +                        </Include-Resource>
> +                    </instructions>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
>
> Propchange: geronimo/server/trunk/framework/bundles/openwebbeans-impl/pom.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Added: geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml?rev=935524&view=auto
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml (added)
> +++ geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml Mon Apr 
> 19 11:07:31 2010
> @@ -0,0 +1,69 @@
> +<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";>
> +
> +    <!--
> +
> +        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.
> +    -->
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.framework</groupId>
> +        <artifactId>framework</artifactId>
> +        <version>3.0-SNAPSHOT</version>
> +    </parent>
> +
> +    <groupId>org.apache.geronimo.bundles</groupId>
> +    <artifactId>openwebbeans-jsf</artifactId>
> +    <version>${pkgVersion}${bundleVersion}</version>
> +    <packaging>bundle</packaging>
> +    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
> +    <description>
> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
> +    </description>
> +
> +    <properties>
> +        <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
> +        <pkgArtifactId>openwebbeans-jsf</pkgArtifactId>
> +        <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>${pkgGroupId}</groupId>
> +            <artifactId>${pkgArtifactId}</artifactId>
> +            <version>${pkgVersion}</version>
> +            <scope>provided</scope>
> +        </dependency>
> +
> +    </dependencies>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.felix</groupId>
> +                <artifactId>maven-bundle-plugin</artifactId>
> +                <configuration>
> +                    <instructions>
> +                        
> <Export-Package>org.apache.webbeans*;version=${pkgVersion}</Export-Package>
> +                        <Import-Package>*</Import-Package>
> +                    </instructions>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
>
> Propchange: geronimo/server/trunk/framework/bundles/openwebbeans-jsf/pom.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Added: geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml?rev=935524&view=auto
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml (added)
> +++ geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml Mon Apr 
> 19 11:07:31 2010
> @@ -0,0 +1,70 @@
> +<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";>
> +
> +    <!--
> +
> +        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.
> +    -->
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.framework</groupId>
> +        <artifactId>framework</artifactId>
> +        <version>3.0-SNAPSHOT</version>
> +    </parent>
> +
> +    <groupId>org.apache.geronimo.bundles</groupId>
> +    <artifactId>openwebbeans-spi</artifactId>
> +    <version>${pkgVersion}${bundleVersion}</version>
> +    <packaging>bundle</packaging>
> +    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
> +    <description>
> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
> +    </description>
> +
> +    <properties>
> +        <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
> +        <pkgArtifactId>openwebbeans-spi</pkgArtifactId>
> +        <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>${pkgGroupId}</groupId>
> +            <artifactId>${pkgArtifactId}</artifactId>
> +            <version>${pkgVersion}</version>
> +            <scope>provided</scope>
> +        </dependency>
> +    </dependencies>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.felix</groupId>
> +                <artifactId>maven-bundle-plugin</artifactId>
> +                <configuration>
> +                    <instructions>
> +                        <Export-Package>
> +                        org.apache.webbeans*;version=${pkgVersion}
> +                        </Export-Package>
> +                        
> <Import-Package>org.apache.webbeans*;version=${pkgVersion},*</Import-Package>
> +                    </instructions>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
>
> Propchange: geronimo/server/trunk/framework/bundles/openwebbeans-spi/pom.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Added: geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml?rev=935524&view=auto
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml (added)
> +++ geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml Mon Apr 
> 19 11:07:31 2010
> @@ -0,0 +1,70 @@
> +<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";>
> +
> +    <!--
> +
> +        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.
> +    -->
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.framework</groupId>
> +        <artifactId>framework</artifactId>
> +        <version>3.0-SNAPSHOT</version>
> +    </parent>
> +
> +    <groupId>org.apache.geronimo.bundles</groupId>
> +    <artifactId>openwebbeans-web</artifactId>
> +    <version>${pkgVersion}${bundleVersion}</version>
> +    <packaging>bundle</packaging>
> +    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
> +    <description>
> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
> +    </description>
> +
> +    <properties>
> +        <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
> +        <pkgArtifactId>openwebbeans-web</pkgArtifactId>
> +        <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>${pkgGroupId}</groupId>
> +            <artifactId>${pkgArtifactId}</artifactId>
> +            <version>${pkgVersion}</version>
> +            <scope>provided</scope>
> +        </dependency>
> +    </dependencies>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.felix</groupId>
> +                <artifactId>maven-bundle-plugin</artifactId>
> +                <configuration>
> +                    <instructions>
> +                        <Export-Package>
> +                        org.apache.webbeans*;version=${pkgVersion}
> +                        </Export-Package>
> +                        <Import-Package>*</Import-Package>
> +                    </instructions>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
>
> Propchange: geronimo/server/trunk/framework/bundles/openwebbeans-web/pom.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Modified: geronimo/server/trunk/framework/bundles/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=935524&r1=935523&r2=935524&view=diff
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/pom.xml (original)
> +++ geronimo/server/trunk/framework/bundles/pom.xml Mon Apr 19 11:07:31 2010
> @@ -57,5 +57,10 @@
>         <module>wadi-group</module>
>         <module>wadi-tribes</module>
>         <module>woodstox</module>
> +        <module>scannotation</module>
> +        <module>openwebbeans-impl</module>
> +        <module>openwebbeans-spi</module>
> +        <module>openwebbeans-web</module>
> +        <module>openwebbeans-jsf</module>
>     </modules>
>  </project>
>
> Added: geronimo/server/trunk/framework/bundles/scannotation/pom.xml
> URL: 
> http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/scannotation/pom.xml?rev=935524&view=auto
> ==============================================================================
> --- geronimo/server/trunk/framework/bundles/scannotation/pom.xml (added)
> +++ geronimo/server/trunk/framework/bundles/scannotation/pom.xml Mon Apr 19 
> 11:07:31 2010
> @@ -0,0 +1,68 @@
> +<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";>
> +
> +    <!--
> +
> +        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.
> +    -->
> +
> +    <modelVersion>4.0.0</modelVersion>
> +
> +    <parent>
> +        <groupId>org.apache.geronimo.framework</groupId>
> +        <artifactId>framework</artifactId>
> +        <version>3.0-SNAPSHOT</version>
> +    </parent>
> +
> +    <groupId>org.apache.geronimo.bundles</groupId>
> +    <artifactId>scannotation</artifactId>
> +    <version>${pkgVersion}${bundleVersion}</version>
> +    <packaging>bundle</packaging>
> +    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
> +    <description>
> +        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
> +    </description>
> +
> +    <properties>
> +        <pkgGroupId>net.sf.scannotation</pkgGroupId>
> +        <pkgArtifactId>scannotation</pkgArtifactId>
> +        <pkgVersion>1.0.2</pkgVersion>
> +    </properties>
> +
> +
> +    <dependencies>
> +        <dependency>
> +            <groupId>${pkgGroupId}</groupId>
> +            <artifactId>${pkgArtifactId}</artifactId>
> +            <version>${pkgVersion}</version>
> +            <scope>provided</scope>
> +        </dependency>
> +    </dependencies>
> +
> +    <build>
> +        <plugins>
> +            <plugin>
> +                <groupId>org.apache.felix</groupId>
> +                <artifactId>maven-bundle-plugin</artifactId>
> +                <configuration>
> +                    <instructions>
> +                        
> <Export-Package>org.scannotation*;version=${pkgVersion}</Export-Package>
> +                        <Import-Package>*</Import-Package>
> +                    </instructions>
> +                </configuration>
> +            </plugin>
> +        </plugins>
> +    </build>
> +</project>
>
> Propchange: geronimo/server/trunk/framework/bundles/scannotation/pom.xml
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
>
>

Reply via email to