geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r833104 - in /geronimo/server/trunk: ./ framework/bundles/aspectjrt/ framework/bundles/aspectjweaver/ framework/bundles/wadi-aop/ framework/bundles/wadi-core/ framework/bundles/wadi-group/ framework/bundles/wadi-tribes/ plugins/aspectj/aspe...
Date Thu, 05 Nov 2009 17:59:42 GMT
Author: rickmcguire
Date: Thu Nov  5 17:59:41 2009
New Revision: 833104

URL: http://svn.apache.org/viewvc?rev=833104&view=rev
Log:
clean up the clustering plugin build

Added:
    geronimo/server/trunk/framework/bundles/aspectjrt/
    geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml   (with props)
    geronimo/server/trunk/framework/bundles/aspectjweaver/
    geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml   (with props)
    geronimo/server/trunk/framework/bundles/wadi-aop/
    geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml   (with props)
    geronimo/server/trunk/framework/bundles/wadi-core/
    geronimo/server/trunk/framework/bundles/wadi-core/pom.xml   (with props)
    geronimo/server/trunk/framework/bundles/wadi-group/
    geronimo/server/trunk/framework/bundles/wadi-group/pom.xml   (with props)
    geronimo/server/trunk/framework/bundles/wadi-tribes/
    geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml   (with props)
Modified:
    geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml
    geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
    geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
    geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Added: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml Thu Nov  5 17:59:41 2009
@@ -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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>aspectjrt</artifactId>
+    <version>1.6.2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.aspectj</pkgGroupId>
+        <pkgArtifactId>aspectjrt</pkgArtifactId>
+        <pkgVersion>1.6.2</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.aspectj*;version="1.6.2"</Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/aspectjrt/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml Thu Nov  5 17:59:41 2009
@@ -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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>aspectjweaver</artifactId>
+    <version>1.6.2-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.aspectj</pkgGroupId>
+        <pkgArtifactId>aspectjweaver</pkgArtifactId>
+        <pkgVersion>1.6.2</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.aspectj.weaver*;version="1.6.2"</Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,com*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/aspectjweaver/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml Thu Nov  5 17:59:41 2009
@@ -0,0 +1,71 @@
+<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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>wadi-aop</artifactId>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.codehaus.wadi</pkgGroupId>
+        <pkgArtifactId>wadi-aop</pkgArtifactId>
+        <pkgVersion>2.1.1</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-aop</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.codehaus.wadi.aop*;version="2.1.1"
+                        </Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/wadi-aop/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-core/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-core/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/wadi-core/pom.xml Thu Nov  5 17:59:41 2009
@@ -0,0 +1,76 @@
+<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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>wadi-core</artifactId>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.codehaus.wadi</pkgGroupId>
+        <pkgArtifactId>wadi-core</pkgArtifactId>
+        <pkgVersion>2.1.1</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-core</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.codehaus.wadi.core*;version="2.1.1",
+                            org.codehaus.wadi.location*;version="2.1.1",
+                            org.codehaus.wadi.replication*;version="2.1.1",
+                            org.codehaus.wadi.servicespace*;version="2.1.1",
+                            org.codehaus.wadi.web*;version="2.1.1",
+                            org.codehaus.wadi.web.impl*;version="2.1.1"
+                        </Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/wadi-core/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-group/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-group/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/wadi-group/pom.xml Thu Nov  5 17:59:41 2009
@@ -0,0 +1,71 @@
+<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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>wadi-group</artifactId>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.codehaus.wadi</pkgGroupId>
+        <pkgArtifactId>wadi-group</pkgArtifactId>
+        <pkgVersion>2.1.1</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-group</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.codehaus.wadi.group*;version="2.1.1"
+                        </Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/wadi-group/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml?rev=833104&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml Thu Nov  5 17:59:41 2009
@@ -0,0 +1,71 @@
+<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>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.bundles</groupId>
+    <artifactId>wadi-tribes</artifactId>
+    <version>2.1.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgGroupId>org.codehaus.wadi</pkgGroupId>
+        <pkgArtifactId>wadi-tribes</pkgArtifactId>
+        <pkgVersion>2.1.1</pkgVersion>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.wadi</groupId>
+            <artifactId>wadi-tribes</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <!--<version>2.0.1-SNAPSHOT</version>-->
+                <configuration>
+                    <instructions>
+                        <Export-Package>
+                            org.codehaus.wadi.tribes*;version="2.1.1"
+                        </Export-Package>
+                        <Import-Package>org*;resolution:=optional,javax*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/wadi-tribes/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/aspectj/pom.xml Thu Nov  5 17:59:41 2009
@@ -27,12 +27,12 @@
         <artifactId>aspectj</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>aspectj</artifactId>
     <name>Geronimo Plugins, AspectJ :: AspectJ</name>
     <packaging>car</packaging>
-    
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
@@ -43,12 +43,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.aspectj</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>aspectjrt</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.aspectj</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
 
@@ -65,7 +65,7 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/aspectj/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -7,6 +7,16 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>aspectjrt</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>aspectjweaver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml (original)
+++ geronimo/server/trunk/plugins/aspectj/geronimo-aspectj/pom.xml Thu Nov  5 17:59:41 2009
@@ -27,20 +27,20 @@
         <artifactId>aspectj</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-aspectj</artifactId>
     <packaging>bundle</packaging>
     <name>Geronimo Plugins, AspectJ :: AspectJ</name>
-    
+
     <dependencies>
         <dependency>
-            <groupId>org.aspectj</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>aspectjrt</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.aspectj</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>aspectjweaver</artifactId>
         </dependency>
 
@@ -62,6 +62,6 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-    
+
 </project>
 

Modified: geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -13,6 +13,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-deploy-jsr88</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml Thu Nov  5 17:59:41 2009
@@ -47,22 +47,22 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-aop</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-group</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-tribes</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/geronimo-plugin-farm/pom.xml Thu Nov  5 17:59:41 2009
@@ -48,6 +48,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-persistence-jpa20</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -13,13 +13,13 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>jmx-security</artifactId>
-        <type>car</type>
+        <artifactId>geronimo-service-builder</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <type>jar</type>
+        <artifactId>jmx-security</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
@@ -32,13 +32,13 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xmlbeans</groupId>
-        <artifactId>xmlbeans</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -16,7 +16,7 @@
         <artifactId>plugin-farm-datasource</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>
@@ -33,6 +33,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-persistence-jpa20</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-plugin-farm</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Thu Nov  5 17:59:41 2009
@@ -81,9 +81,9 @@
 
             <!-- WADI support -->
             <dependency>
-                <groupId>org.codehaus.wadi</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-aop</artifactId>
-                <version>${wadiVersion}</version>
+                <version>${wadiVersion}-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -98,9 +98,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.wadi</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-core</artifactId>
-                <version>${wadiVersion}</version>
+                <version>${wadiVersion}-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -118,9 +118,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.wadi</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-group</artifactId>
-                <version>${wadiVersion}</version>
+                <version>${wadiVersion}-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -130,9 +130,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.wadi</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>wadi-tribes</artifactId>
-                <version>${wadiVersion}</version>
+                <version>${wadiVersion}-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Thu Nov  5 17:59:41 2009
@@ -69,22 +69,22 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-aop</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-group</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.wadi</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>wadi-tribes</artifactId>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -7,6 +7,31 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>wadi-aop</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>wadi-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>wadi-group</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>wadi-tribes</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>aspectj</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml Thu Nov  5 17:59:41 2009
@@ -21,13 +21,13 @@
 <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.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-openejb-builder</artifactId>
     <packaging>bundle</packaging>
@@ -91,6 +91,17 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <!--packages containing "impl" or "internal" are excluded by default -->
+                        <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml Thu Nov  5 17:59:41 2009
@@ -21,13 +21,13 @@
 <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.geronimo.plugins</groupId>
         <artifactId>openejb</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>openejb-deployer</artifactId>
     <name>Geronimo Plugins, OpenEJB :: Deployer</name>
@@ -42,14 +42,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer-1_6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>openejb</artifactId>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Thu Nov  5 17:59:41 2009
@@ -62,6 +62,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-api</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=833104&r1=833103&r2=833104&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Nov  5 17:59:41 2009
@@ -534,15 +534,15 @@
             </dependency>
 
             <dependency>
-                <groupId>org.aspectj</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjrt</artifactId>
-                <version>1.6.2</version>
+                <version>1.6.2-SNAPSHOT</version>
             </dependency>
 
             <dependency>
-                <groupId>org.aspectj</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.6.2</version>
+                <version>1.6.2-SNAPSHOT</version>
             </dependency>
 
             <!--



Mime
View raw message