geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r883467 - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/bundles/ framework/bundles/derby-all/ framework/bundles/derbynet/ framework/bundles/derbytools/ pl...
Date Mon, 23 Nov 2009 19:12:59 GMT
Author: gawor
Date: Mon Nov 23 19:12:58 2009
New Revision: 883467

URL: http://svn.apache.org/viewvc?rev=883467&view=rev
Log:
get system-database plugin to run

Added:
    geronimo/server/trunk/framework/bundles/derby-all/
    geronimo/server/trunk/framework/bundles/derby-all/pom.xml   (with props)
Removed:
    geronimo/server/trunk/framework/bundles/derbynet/
    geronimo/server/trunk/framework/bundles/derbytools/
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
    geronimo/server/trunk/framework/bundles/pom.xml
    geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
    geronimo/server/trunk/plugins/system-database/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ArchiveCarMojo.java
Mon Nov 23 19:12:58 2009
@@ -20,9 +20,14 @@
 package org.apache.geronimo.mavenplugins.car;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.Reader;
 import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarFile;
+import java.util.jar.Manifest;
 
 import org.apache.geronimo.kernel.osgi.ConfigurationActivator;
 import org.apache.geronimo.system.osgi.BootActivator;
@@ -282,6 +287,10 @@
                     }
                 }
 
+                String classpath = getBundleClassPath();
+                if (classpath != null) {
+                    archive.addManifestEntry(Constants.BUNDLE_CLASSPATH, classpath);
+                }
                 archive.addManifestEntry(Constants.IMPORT_PACKAGE, imports.toString());
                 archive.addManifestEntry(Constants.DYNAMICIMPORT_PACKAGE, "*");
             }
@@ -338,5 +347,23 @@
 
         return buff.toString();
     }
+    
+    public String getBundleClassPath() throws IOException {
+        String classpath = null;
+        File mfFile = new File(getArtifactInRepositoryDir(), JarFile.MANIFEST_NAME);
+        if (mfFile.exists()) {
+            FileInputStream in = new FileInputStream(mfFile);
+            try {
+                Manifest mf = new Manifest(in);
+                Attributes attrs = mf.getMainAttributes();
+                if (attrs != null) {
+                    classpath = attrs.getValue(Constants.BUNDLE_CLASSPATH);
+                }
+            } finally {
+                try { in.close(); } catch (IOException e) {}
+            }
+        }
+        return classpath;
+    }
 
 }
\ No newline at end of file

Added: geronimo/server/trunk/framework/bundles/derby-all/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/derby-all/pom.xml?rev=883467&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/derby-all/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/derby-all/pom.xml Mon Nov 23 19:12:58 2009
@@ -0,0 +1,86 @@
+<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>derby-all</artifactId>
+    <version>${derbyVersion}-SNAPSHOT</version>
+    <packaging>bundle</packaging>
+    <name>Apache Geronimo Bundles: Derby-${derbyVersion}</name>
+    <description>
+        This bundle simply wraps Derby
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>${derbyVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <version>${derbyVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>${derbyVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <version>${derbyVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.derby*;version="10.4.2.0"</Export-Package>
+                        <Import-Package>javax.servlet*;resolution:=optional,org.apache.xpath*;resolution:=optional,org.apache.xalan*;resolution:=optional,org.apache.xml*;resolution:=optional,*</Import-Package>
+                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

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

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

Modified: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (original)
+++ geronimo/server/trunk/framework/bundles/pom.xml Mon Nov 23 19:12:58 2009
@@ -40,8 +40,7 @@
         <module>aspectjrt</module>
         <module>aspectjweaver</module>
         <module>castor</module>
-        <module>derbynet</module>
-        <module>derbytools</module>
+        <module>derby-all</module>
         <module>ldapsdk</module>
         <!-- todo remove -->
         <module>log4j</module>

Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml Mon Nov 23 19:12:58
2009
@@ -37,29 +37,11 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derbyclient</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>derbynet</artifactId>
-            <version>${derbyVersion}-SNAPSHOT</version>
+            <artifactId>derby-all</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>derbytools</artifactId>
-            <version>${derbyVersion}-SNAPSHOT</version>
-        </dependency>
-
-
-        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/pom.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/pom.xml Mon Nov 23 19:12:58 2009
@@ -39,7 +39,7 @@
     <modules>
         <module>geronimo-derby</module>
         <module>system-database</module>
-        <module>sysdb-portlets</module>
+        <!--<module>sysdb-portlets</module>-->
         <!--<module>sysdb-console-jetty</module>-->
         <!--<module>sysdb-console-tomcat</module>-->
     </modules>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Mon Nov 23 19:12:58
2009
@@ -38,11 +38,6 @@
     </description>
 
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.specs</groupId>-->
-            <!--<artifactId>geronimo-interceptor_3.0_spec</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -81,18 +76,18 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-jdbc</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
             <scope>provided</scope>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-            <!--<artifactId>geronimo-service-builder</artifactId>-->
-            <!--<version>${version}</version>-->
-        <!--</dependency>-->
-
     </dependencies>
 
     <build>
@@ -129,18 +124,6 @@
                      </instance>
                 </configuration>
             </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",org.apache.geronimo.deployment.xbeans.impl,*</Import-Package>
-                        <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                    </instructions>
-                </configuration>
-            </plugin>
-
         </plugins>
     </build>
 

Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
Mon Nov 23 19:12:58 2009
@@ -7,33 +7,8 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derbyclient</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derbynet</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derbytools</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>derbynet</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>derbytools</artifactId>
+        <artifactId>derby-all</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -42,6 +17,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-jdbc</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-derby</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=883467&r1=883466&r2=883467&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Nov 23 19:12:58 2009
@@ -760,9 +760,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
+                <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
-                <version>${derbyVersion}-SNAPSHOT</version>
+                <version>${derbyVersion}</version>
             </dependency>
 
             <dependency>
@@ -778,6 +778,12 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.bundles</groupId>
+                <artifactId>derby-all</artifactId>
+                <version>${derbyVersion}-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
                 <groupId>regexp</groupId>
                 <artifactId>regexp</artifactId>
                 <version>1.3</version>



Mime
View raw message