geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r936850 - in /geronimo/bundles/trunk: ./ asm-3.1/ asm-commons-3.1/ aspectjrt/ aspectjweaver/ axis/ backport-util-concurrent/ bundles-parent/ castor/ commons-digester/ commons-discovery/ derby-all/ dwr/ httpcore/ jaxb-impl/ jstl/ karaf-clien...
Date Thu, 22 Apr 2010 13:59:43 GMT
Author: rickmcguire
Date: Thu Apr 22 13:59:42 2010
New Revision: 936850

URL: http://svn.apache.org/viewvc?rev=936850&view=rev
Log:
Build cleanup changes

Added:
    geronimo/bundles/trunk/openwebbeans-impl/   (props changed)
      - copied from r936388, geronimo/server/trunk/framework/bundles/openwebbeans-impl/
    geronimo/bundles/trunk/openwebbeans-jsf/   (props changed)
      - copied from r936388, geronimo/server/trunk/framework/bundles/openwebbeans-jsf/
    geronimo/bundles/trunk/openwebbeans-spi/   (props changed)
      - copied from r936388, geronimo/server/trunk/framework/bundles/openwebbeans-spi/
    geronimo/bundles/trunk/openwebbeans-web/   (props changed)
      - copied from r936388, geronimo/server/trunk/framework/bundles/openwebbeans-web/
Modified:
    geronimo/bundles/trunk/asm-3.1/pom.xml
    geronimo/bundles/trunk/asm-commons-3.1/pom.xml
    geronimo/bundles/trunk/aspectjrt/pom.xml
    geronimo/bundles/trunk/aspectjweaver/pom.xml
    geronimo/bundles/trunk/axis/pom.xml
    geronimo/bundles/trunk/backport-util-concurrent/pom.xml
    geronimo/bundles/trunk/bundles-parent/pom.xml
    geronimo/bundles/trunk/castor/pom.xml
    geronimo/bundles/trunk/commons-digester/pom.xml
    geronimo/bundles/trunk/commons-discovery/pom.xml
    geronimo/bundles/trunk/derby-all/pom.xml
    geronimo/bundles/trunk/dwr/pom.xml
    geronimo/bundles/trunk/httpcore/pom.xml
    geronimo/bundles/trunk/jaxb-impl/pom.xml
    geronimo/bundles/trunk/jstl/pom.xml
    geronimo/bundles/trunk/karaf-client/pom.xml
    geronimo/bundles/trunk/openwebbeans-impl/pom.xml
    geronimo/bundles/trunk/openwebbeans-jsf/pom.xml
    geronimo/bundles/trunk/openwebbeans-spi/pom.xml
    geronimo/bundles/trunk/openwebbeans-web/pom.xml
    geronimo/bundles/trunk/pom.xml
    geronimo/bundles/trunk/sxc-jaxb/pom.xml
    geronimo/bundles/trunk/sxc-runtime/pom.xml
    geronimo/bundles/trunk/wadi-aop/pom.xml
    geronimo/bundles/trunk/wadi-core/pom.xml
    geronimo/bundles/trunk/wadi-group/pom.xml
    geronimo/bundles/trunk/wadi-tribes/pom.xml
    geronimo/bundles/trunk/woden-impl-dom/pom.xml
    geronimo/bundles/trunk/woodstox/pom.xml

Modified: geronimo/bundles/trunk/asm-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-3.1/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/asm-3.1/pom.xml (original)
+++ geronimo/bundles/trunk/asm-3.1/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,12 @@
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/asm-3.1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/asm-3.1</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-3.1</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -59,8 +65,6 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.objectweb.asm*;version="3.1",*</Export-Package>
-                        <!--<Import-Package>com.envoisolutions.sxc.builder*;resolution:=optional,com.envoisolutions.sxc.compiler*;resolution:=optional,com.sun.codemodel*;resolution:=optional,com.sun.xml.fastinfoset*;resolution:=optional,com.sun.xml.txw2*;resolution:=optional,org.jvnet.fastinfoset*;resolution:=optional,org.jvnet.staxex*;resolution:=optional,sun.misc*;resolution:=optional,*</Import-Package>-->
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/bundles/trunk/asm-commons-3.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-commons-3.1/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/asm-commons-3.1/pom.xml (original)
+++ geronimo/bundles/trunk/asm-commons-3.1/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,12 @@
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/asm-commons-3.1</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/asm-commons-3.1</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/asm-commons-3.1</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/aspectjrt/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjrt/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjrt/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjrt/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,13 @@
         <pkgVersion>1.6.2</pkgVersion>
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/aspectjrt</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/aspectjrt</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjrt</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/aspectjweaver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjweaver/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/aspectjweaver/pom.xml (original)
+++ geronimo/bundles/trunk/aspectjweaver/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,13 @@
         <pkgVersion>1.6.2</pkgVersion>
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/aspectjweaver</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/aspectjweaver</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/aspectjweaver</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis/pom.xml (original)
+++ geronimo/bundles/trunk/axis/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/axis</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/axis</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.axis</pkgGroupId>
         <pkgArtifactId>axis</pkgArtifactId>

Modified: geronimo/bundles/trunk/backport-util-concurrent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/backport-util-concurrent/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/backport-util-concurrent/pom.xml (original)
+++ geronimo/bundles/trunk/backport-util-concurrent/pom.xml Thu Apr 22 13:59:42 2010
@@ -43,6 +43,12 @@
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/backport-util-concurrent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/backport-util-concurrent</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/backport-util-concurrent</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/bundles-parent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/bundles-parent/pom.xml (original)
+++ geronimo/bundles/trunk/bundles-parent/pom.xml Thu Apr 22 13:59:42 2010
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -39,8 +39,8 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/specs-parent</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/specs-parent</developerConnection>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/bundles-parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/bundles-parent</developerConnection>
         <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/bundles-parent</url>
     </scm>
 
@@ -53,7 +53,7 @@
     </distributionManagement>
 
     <properties>
-        <siteId>specs</siteId>
+        <siteId>bundles</siteId>
         <projectName>Apache Geronimo Bundles</projectName>
         <!--
               |
@@ -98,24 +98,11 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-Name>${artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${geronimo.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Export-Package>${geronimo.osgi.export}</Export-Package>
-                        <Import-Package>${geronimo.osgi.import}</Import-Package>
-                        <Private-Package>${geronimo.osgi.private.pkg}</Private-Package>
-                        <Implementation-Title>Apache Geronimo</Implementation-Title>
+                        <Implementation-Title>${project.name}</Implementation-Title>
                         <Implementation-Version>${project.version}</Implementation-Version>
+                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
                     </instructions>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>

Modified: geronimo/bundles/trunk/castor/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/castor/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/castor/pom.xml (original)
+++ geronimo/bundles/trunk/castor/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,13 @@
         <pkgVersion>1.0.5</pkgVersion>
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/castor</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/castor</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/castor</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/commons-digester/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-digester/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-digester/pom.xml (original)
+++ geronimo/bundles/trunk/commons-digester/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/commons-digester</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/commons-digester</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-digester</url>
+    </scm>
+
     <properties>
         <pkgGroupId>commons-digester</pkgGroupId>
         <pkgArtifactId>commons-digester</pkgArtifactId>

Modified: geronimo/bundles/trunk/commons-discovery/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-discovery/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/commons-discovery/pom.xml (original)
+++ geronimo/bundles/trunk/commons-discovery/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,13 @@
         <pkgVersion>0.4</pkgVersion>
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/commons-discover</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/commons-discovery</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/commons-discovery</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/derby-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/derby-all/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/derby-all/pom.xml (original)
+++ geronimo/bundles/trunk/derby-all/pom.xml Thu Apr 22 13:59:42 2010
@@ -42,6 +42,12 @@
         <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/derby-all</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/derby-all</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/derby-all</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>

Modified: geronimo/bundles/trunk/dwr/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/dwr/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/dwr/pom.xml (original)
+++ geronimo/bundles/trunk/dwr/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,17 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
-    <!--<dependency>-->
-        <!--<groupId>org.directwebremoting</groupId>-->
-        <!--<artifactId>dwr</artifactId>-->
-        <!--<version>3.0.M1</version>-->
-        <!--<exclusions>-->
-            <!--<exclusion>-->
-                <!--<groupId>org.mortbay.jetty</groupId>-->
-                <!--<artifactId>cometd</artifactId>-->
-            <!--</exclusion>-->
-        <!--</exclusions>-->
-    <!--</dependency>-->
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/dwr</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/dwr</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/derby-all</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.directwebremoting</pkgGroupId>
         <pkgArtifactId>dwr</pkgArtifactId>

Modified: geronimo/bundles/trunk/httpcore/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/httpcore/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/httpcore/pom.xml (original)
+++ geronimo/bundles/trunk/httpcore/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/httpcore</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/httpcore</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/http-core</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.httpcomponents</pkgGroupId>
         <pkgArtifactId>httpcore</pkgArtifactId>

Modified: geronimo/bundles/trunk/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jaxb-impl/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/jaxb-impl/pom.xml (original)
+++ geronimo/bundles/trunk/jaxb-impl/pom.xml Thu Apr 22 13:59:42 2010
@@ -35,6 +35,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/jaxb-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/jaxb-impl</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/jaxb-impl</url>
+    </scm>
+
     <properties>
         <pkgGroupId>com.sun.xml.bind</pkgGroupId>
         <pkgArtifactId>jaxb-impl</pkgArtifactId>

Modified: geronimo/bundles/trunk/jstl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/jstl/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/jstl/pom.xml (original)
+++ geronimo/bundles/trunk/jstl/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/jstl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/jstl</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/jstl</url>
+    </scm>
+
     <properties>
         <pkgGroupId>javax.servlet</pkgGroupId>
         <pkgArtifactId>jstl</pkgArtifactId>

Modified: geronimo/bundles/trunk/karaf-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/karaf-client/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/karaf-client/pom.xml (original)
+++ geronimo/bundles/trunk/karaf-client/pom.xml Thu Apr 22 13:59:42 2010
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>bundles-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>

Propchange: geronimo/bundles/trunk/openwebbeans-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 22 13:59:42 2010
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/bundles/openwebbeans-impl:826768,832538,885058
+/geronimo/server/trunk/framework/bundles/openwebbeans-impl:749113,749116-807432,809079-825588

Modified: geronimo/bundles/trunk/openwebbeans-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-impl/pom.xml?rev=936850&r1=936388&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/openwebbeans-impl/pom.xml (original)
+++ geronimo/bundles/trunk/openwebbeans-impl/pom.xml Thu Apr 22 13:59:42 2010
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>framework</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -39,16 +39,22 @@
         <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
         <pkgArtifactId>openwebbeans-impl</pkgArtifactId>
         <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
+        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
-    
-    
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-impl</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-impl</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-impl</url>
+    </scm>
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <scope>provided</scope>
-        </dependency>       
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,10 +68,10 @@
                         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>
+                        <Private-Package>
+                           META-INF;-split-package:=merge-first,
+                           META-INF.openwebbeans;-split-package:=merge-first,
+                        </Private-Package>
                     </instructions>
                 </configuration>
             </plugin>

Propchange: geronimo/bundles/trunk/openwebbeans-jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 22 13:59:42 2010
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/bundles/openwebbeans-jsf:826768,832538,885058
+/geronimo/server/trunk/framework/bundles/openwebbeans-jsf:749113,749116-807432,809079-825588

Modified: geronimo/bundles/trunk/openwebbeans-jsf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-jsf/pom.xml?rev=936850&r1=936388&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/openwebbeans-jsf/pom.xml (original)
+++ geronimo/bundles/trunk/openwebbeans-jsf/pom.xml Thu Apr 22 13:59:42 2010
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>framework</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -35,13 +35,20 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-jsf</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-jsf</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-jsf</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
         <pkgArtifactId>openwebbeans-jsf</pkgArtifactId>
         <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
+        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
-    
-    
+
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
@@ -49,7 +56,7 @@
             <version>${pkgVersion}</version>
             <scope>provided</scope>
         </dependency>
-  
+
     </dependencies>
 
     <build>

Propchange: geronimo/bundles/trunk/openwebbeans-spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 22 13:59:42 2010
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/bundles/openwebbeans-spi:826768,832538,885058
+/geronimo/server/trunk/framework/bundles/openwebbeans-spi:749113,749116-807432,809079-825588

Modified: geronimo/bundles/trunk/openwebbeans-spi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-spi/pom.xml?rev=936850&r1=936388&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/openwebbeans-spi/pom.xml (original)
+++ geronimo/bundles/trunk/openwebbeans-spi/pom.xml Thu Apr 22 13:59:42 2010
@@ -20,10 +20,11 @@
 
     <modelVersion>4.0.0</modelVersion>
 
+
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>framework</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -35,20 +36,27 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-spi</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-spi</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-spi</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
         <pkgArtifactId>openwebbeans-spi</pkgArtifactId>
         <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
+        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
-    
-    
+
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <scope>provided</scope>
-        </dependency>       
+        </dependency>
     </dependencies>
 
     <build>

Propchange: geronimo/bundles/trunk/openwebbeans-web/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Apr 22 13:59:42 2010
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/bundles/openwebbeans-web:826768,832538,885058
+/geronimo/server/trunk/framework/bundles/openwebbeans-web:749113,749116-807432,809079-825588

Modified: geronimo/bundles/trunk/openwebbeans-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-web/pom.xml?rev=936850&r1=936388&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/openwebbeans-web/pom.xml (original)
+++ geronimo/bundles/trunk/openwebbeans-web/pom.xml Thu Apr 22 13:59:42 2010
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>framework</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>bundles-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -35,20 +35,27 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-spi</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/openwebbeans-spi</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/openwebbeans-spi</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.openwebbeans</pkgGroupId>
         <pkgArtifactId>openwebbeans-web</pkgArtifactId>
         <pkgVersion>1.0.0-SNAPSHOT</pkgVersion>
+        <bundleVersion>_1-SNAPSHOT</bundleVersion>
     </properties>
-    
-    
+
+
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <scope>provided</scope>
-        </dependency>       
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/pom.xml (original)
+++ geronimo/bundles/trunk/pom.xml Thu Apr 22 13:59:42 2010
@@ -24,9 +24,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.5</version>
+        <groupId>org.apache.geronimo.genesis</groupId>
+        <artifactId>genesis-java5-flava</artifactId>
+        <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.bundles</groupId>
@@ -40,7 +40,14 @@
         is never released.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk</url>
+    </scm>
+
     <modules>
+        <module>bundles-parent</module>
         <module>aspectjrt</module>
         <module>aspectjweaver</module>
         <module>axis</module>
@@ -54,7 +61,6 @@
         <module>woden-impl-dom</module>
         <module>backport-util-concurrent</module>
         <module>httpcore</module>
-        <module>karaf-client</module>
         <module>sxc-jaxb</module>
         <module>sxc-runtime</module>
         <module>wadi-aop</module>
@@ -62,5 +68,9 @@
         <module>wadi-group</module>
         <module>wadi-tribes</module>
         <module>woodstox</module>
+        <module>openwebbeans-impl</module>
+        <module>openwebbeans-jsf</module>
+        <module>openwebbeans-spi</module>
+        <module>openwebbeans-web</module>
     </modules>
 </project>

Modified: geronimo/bundles/trunk/sxc-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-jaxb/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-jaxb/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-jaxb</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-jaxb</url>
+    </scm>
+
     <properties>
         <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
         <pkgArtifactId>sxc-jaxb</pkgArtifactId>

Modified: geronimo/bundles/trunk/sxc-runtime/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/sxc-runtime/pom.xml (original)
+++ geronimo/bundles/trunk/sxc-runtime/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/sxc-runtime</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/sxc-runtime</url>
+    </scm>
+
     <properties>
         <pkgGroupId>com.envoisolutions.sxc</pkgGroupId>
         <pkgArtifactId>sxc-runtime</pkgArtifactId>

Modified: geronimo/bundles/trunk/wadi-aop/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-aop/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-aop/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-aop/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-aop</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-aop</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-aop</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-aop</pkgArtifactId>

Modified: geronimo/bundles/trunk/wadi-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-core/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-core/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-core/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-core</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-core</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-core</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-core</pkgArtifactId>

Modified: geronimo/bundles/trunk/wadi-group/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-group/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-group/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-group/pom.xml Thu Apr 22 13:59:42 2010
@@ -37,6 +37,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-group</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-group</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-group</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-group</pkgArtifactId>

Modified: geronimo/bundles/trunk/wadi-tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-tribes/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/wadi-tribes/pom.xml (original)
+++ geronimo/bundles/trunk/wadi-tribes/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-tribes</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/wadi-tribes</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/wadi-tribes</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.codehaus.wadi</pkgGroupId>
         <pkgArtifactId>wadi-tribes</pkgArtifactId>

Modified: geronimo/bundles/trunk/woden-impl-dom/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woden-impl-dom/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/woden-impl-dom/pom.xml (original)
+++ geronimo/bundles/trunk/woden-impl-dom/pom.xml Thu Apr 22 13:59:42 2010
@@ -36,6 +36,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/woden-impl-dom</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/woden-impl-dom</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/woden-impl-dom</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.apache.woden</pkgGroupId>
         <pkgArtifactId>woden-impl-dom</pkgArtifactId>

Modified: geronimo/bundles/trunk/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/woodstox/pom.xml?rev=936850&r1=936849&r2=936850&view=diff
==============================================================================
--- geronimo/bundles/trunk/woodstox/pom.xml (original)
+++ geronimo/bundles/trunk/woodstox/pom.xml Thu Apr 22 13:59:42 2010
@@ -35,6 +35,12 @@
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
 
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/bundles/trunk/woodstox</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/bundles/trunk/woodstox</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/bundles/trunk/woodstox</url>
+    </scm>
+
     <properties>
         <pkgGroupId>org.codehaus.woodstox</pkgGroupId>
         <pkgArtifactId>woodstox</pkgArtifactId>



Mime
View raw message