servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1414548 - in /servicemix/smx4/bundles/trunk: ./ derby-10.8.2.2/ derby-10.9.1.0/ derby-10.9.1.0/src/ derby-10.9.1.0/src/main/ derby-10.9.1.0/src/main/resources/ derby-10.9.1.0/src/main/resources/OSGI-INF/ derbynet-10.9.1.0/ derbynet-10.9.1....
Date Wed, 28 Nov 2012 06:52:58 GMT
Author: jbonofre
Date: Wed Nov 28 06:52:57 2012
New Revision: 1414548

URL: http://svn.apache.org/viewvc?rev=1414548&view=rev
Log:
[SMX4-1296] Create OSGi bundles for derby and derbynet 10.9.1.0

Added:
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml
      - copied, changed from r1414352, servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/pom.xml
      - copied, changed from r1414352, servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/
    servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
Modified:
    servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml
    servicemix/smx4/bundles/trunk/pom.xml

Modified: servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml?rev=1414548&r1=1414547&r2=1414548&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml Wed Nov 28 06:52:57 2012
@@ -59,7 +59,7 @@
             org.w3c.dom.xpath,
             org.xml.sax,
             com.ibm.jvm;resolution:=optional,
-            javax.servlet*;resolution:=optional,
+            javax.servlet*;resolution:=optional
         </servicemix.osgi.import.pkg>
     </properties>
 

Copied: servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml (from r1414352, servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml?p2=servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml&p1=servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml&r1=1414352&r2=1414548&rev=1414548&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derby-10.9.1.0/pom.xml Wed Nov 28 06:52:57 2012
@@ -30,14 +30,14 @@
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>org.apache.servicemix.bundles.derby</artifactId>
-    <version>10.8.2.2_2-SNAPSHOT</version>
+    <version>10.9.1.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Apache ServiceMix :: Bundles :: derby</name>
     <description>This OSGi bundle wraps derby, derbyclient and derbynet ${pkgVersion}
jar files.</description>
 
     <properties>
         <pkgGroupId>org.apache.derby</pkgGroupId>
-        <pkgVersion>10.8.2.2</pkgVersion>
+        <pkgVersion>10.9.1.0</pkgVersion>
         <servicemix.osgi.export.pkg>
             org.apache.derby
         </servicemix.osgi.export.pkg>
@@ -59,7 +59,7 @@
             org.w3c.dom.xpath,
             org.xml.sax,
             com.ibm.jvm;resolution:=optional,
-            javax.servlet*;resolution:=optional,
+            javax.servlet*;resolution:=optional
         </servicemix.osgi.import.pkg>
     </properties>
 

Added: servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/bundle.info?rev=1414548&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/bundle.info (added)
+++ servicemix/smx4/bundles/trunk/derby-10.9.1.0/src/main/resources/OSGI-INF/bundle.info Wed
Nov 28 06:52:57 2012
@@ -0,0 +1,12 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/derby/${pkgVersion}\u001B[0m
+        \u001B[33mmvn:${pkgGroupId}/derbynet/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Apache Derby is an open source relational database implemented entirely in Java.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://db.apache.org/derby/\u001B[0m

Copied: servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/pom.xml (from r1414352, servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/pom.xml?p2=servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/pom.xml&p1=servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml&r1=1414352&r2=1414548&rev=1414548&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/derby-10.8.2.2/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/pom.xml Wed Nov 28 06:52:57 2012
@@ -13,7 +13,7 @@
            http://www.apache.org/licenses/LICENSE-2.0
 
         Unless required by applicable law or agreed to in writing, software
-        distributed u'nder the License is distributed on an "AS IS" BASIS,
+        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.
@@ -29,71 +29,73 @@
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>org.apache.servicemix.bundles.derby</artifactId>
-    <version>10.8.2.2_2-SNAPSHOT</version>
+    <artifactId>org.apache.servicemix.bundles.derbynet</artifactId>
+    <version>10.9.1.0_1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>Apache ServiceMix :: Bundles :: derby</name>
-    <description>This OSGi bundle wraps derby, derbyclient and derbynet ${pkgVersion}
jar files.</description>
+    <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
+    <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
 
     <properties>
         <pkgGroupId>org.apache.derby</pkgGroupId>
-        <pkgVersion>10.8.2.2</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.apache.derby
-        </servicemix.osgi.export.pkg>
+        <pkgArtifactId>derbynet</pkgArtifactId>
+        <pkgVersion>10.9.1.0</pkgVersion>
+        <servicemix.osgi.export>
+            org.apache.derby.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.drda;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.impl.tools.sysinfo;version=${pkgVersion};-split-package:=merge-first,
+            org.apache.derby.mbeans.drda;version=${pkgVersion};-split-package:=merge-first
+        </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
             javax.crypto*,
             javax.management,
-            javax.naming*,
-            javax.naming,
             javax.net*,
             javax.security.auth,
+            javax.servlet*,
             javax.sql,
             javax.transaction.xa,
-            javax.xml.parsers,
-            javax.xml.transform,
-            javax.xml.transform.dom,
-            javax.xml.transform.stream,
-            org.osgi.framework,
-            org.w3c.dom,
-            org.w3c.dom.xpath,
             org.xml.sax,
-            com.ibm.jvm;resolution:=optional,
-            javax.servlet*;resolution:=optional,
+            org.apache.derby.catalog,
+            org.apache.derby.iapi.db,
+            org.apache.derby.iapi.error,
+            org.apache.derby.iapi.jdbc,
+            org.apache.derby.iapi.services.i18n,
+            org.apache.derby.iapi.services.info,
+            org.apache.derby.iapi.services.io,
+            org.apache.derby.iapi.services.jmx,
+            org.apache.derby.iapi.services.monitor,
+            org.apache.derby.iapi.services.property,
+            org.apache.derby.iapi.services.stream,
+            org.apache.derby.iapi.store.access.xa,
+            org.apache.derby.iapi.tools.i18n,
+            org.apache.derby.iapi.util,
+            org.apache.derby.impl.jdbc,
+            org.apache.derby.jdbc,
+            org.apache.derby.mbeans,
+            org.apache.derby.security,
+            org.osgi.framework,
+            com.ibm.jvm;resolution:=optional
         </servicemix.osgi.import.pkg>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>derby</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>derbyclient</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>derbynet</artifactId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>${pkgGroupId}</groupId>
+                    <artifactId>derby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <!-- sources
-        <dependency>
-            <groupId>${pkgGroupId}</groupId>
-            <artifactId>derby</artifactId>
-            <version>${pkgVersion}</version>
-            <classifier>sources</classifier>
-            <optional>true</optional>
-        </dependency>
+        <!-- sources -->
+        <!-- Not available on Central
         <dependency>
             <groupId>${pkgGroupId}</groupId>
-            <artifactId>derbynet</artifactId>
+            <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
             <classifier>sources</classifier>
             <optional>true</optional>
@@ -115,27 +117,12 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>${pkgGroupId}:derby</include>
-                                    <include>${pkgGroupId}:derbyclient</include>
-                                    <include>${pkgGroupId}:derbynet</include>
+                                    <include>${pkgGroupId}:${pkgArtifactId}</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>${pkgGroupId}:derby</artifact>
-                                    <includes>
-                                        <include>**/*.properties</include>
-                                    </includes>
-                                </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:derbyclient</artifact>
-                                    <includes>
-                                        <include>**/*.properties</include>
-                                        <include>META-INF/services/**</include>
-                                    </includes>
-                                </filter>
-                                <filter>
-                                    <artifact>${pkgGroupId}:derbynet</artifact>
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
                                     <includes>
                                         <include>**/*.properties</include>
                                         <include>**/*.policy</include>
@@ -150,4 +137,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>

Added: servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/bundle.info?rev=1414548&view=auto
==============================================================================
--- servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
(added)
+++ servicemix/smx4/bundles/trunk/derbynet-10.9.1.0/src/main/resources/OSGI-INF/bundle.info
Wed Nov 28 06:52:57 2012
@@ -0,0 +1,14 @@
+\u001B[1mSYNOPSIS\u001B[0m
+    ${project.description}
+
+    Original Maven URL:
+        \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+    Apache Derby is an open source relational database implemented entirely in Java.
+
+    Derbynet provides support the more familiar client/server mode with the Derby Network
Client JDBC driver and
+    Derby Network Server.
+
+\u001B[1mSEE ALSO\u001B[0m
+    \u001B[36mhttp://db.apache.org/derby/\u001B[0m

Modified: servicemix/smx4/bundles/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/bundles/trunk/pom.xml?rev=1414548&r1=1414547&r2=1414548&view=diff
==============================================================================
--- servicemix/smx4/bundles/trunk/pom.xml (original)
+++ servicemix/smx4/bundles/trunk/pom.xml Wed Nov 28 06:52:57 2012
@@ -68,6 +68,8 @@
         <module>batik-1.7</module>
         <module>dbunit-2.4.9</module>
         <module>dbunit-2.4.8</module>
+        <module>derby-10.9.1.0</module>
+        <module>derbynet-10.9.1.0</module>
     </modules>
 
 </project>



Mime
View raw message