geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1221385 - in /geronimo/server/trunk: ./ framework/buildsupport/car-maven-plugin/ framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ framework/buildsupport/car-maven-plugin/src/main/resources/META-IN...
Date Tue, 20 Dec 2011 18:04:06 GMT
Author: djencks
Date: Tue Dec 20 18:04:06 2011
New Revision: 1221385

URL: http://svn.apache.org/viewvc?rev=1221385&view=rev
Log:
GERONIMO-6240 fire up a karaf instance we assembled in target for the framework.

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1221385&r1=1221384&r2=1221385&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Tue Dec 20 18:04:06
2011
@@ -52,11 +52,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>sxc-jaxb</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.2_spec</artifactId>
         </dependency>
@@ -270,13 +265,16 @@
             <artifactId>org.apache.karaf.jaas.boot</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.main</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-mvn</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.tooling</groupId>
             <artifactId>karaf-maven-plugin</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=1221385&r1=1221384&r2=1221385&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Tue Dec 20 18:04:06 2011
@@ -39,6 +39,7 @@ import java.util.ArrayList;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
 import org.apache.geronimo.system.plugin.model.DependencyType;
 import org.apache.geronimo.system.plugin.model.ImportType;
+import org.apache.karaf.main.Main;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
@@ -680,6 +681,37 @@ public abstract class AbstractCarMojo
     protected Framework getFramework() throws BundleException {
         setLoggingLevel();
 
+        File karafHome = new File(new File(basedir, "target"), "assembly");
+        System.setProperty(Main.PROP_KARAF_HOME, karafHome.getAbsolutePath());
+        System.setProperty(Main.PROP_KARAF_BASE, karafHome.getAbsolutePath());
+        System.setProperty(Main.PROP_KARAF_DATA, new File(karafHome, "data").getAbsolutePath());
+        System.setProperty(Main.PROP_KARAF_INSTANCES, new File(karafHome, "instances").getAbsolutePath());
+
+        //enable mvn url handling
+//        new org.ops4j.pax.url.mvn.internal.Activator().start(framework.getBundleContext());
+        //don't allow mvn urls
+        if (systemProperties == null) {
+            systemProperties = new HashMap<String, String>();
+        }
+        systemProperties.put("geronimo.build.car", "true");
+        //Fix JIRA GERONIMO-5400
+        if (null == System.getProperty("openejb.log.factory")) {
+            systemProperties.put("openejb.log.factory", "org.apache.openejb.util.PaxLogStreamFactory");
+        }
+        systemProperties.put("karaf.startLocalConsole", "false");
+        systemProperties.put("openejb.geronimo", "true");
+        setSystemProperties();
+
+        Main main = new Main(new String[] {});
+        try {
+            main.launch();
+            return main.getFramework();
+        } catch (Exception e) {
+            if (1 == 1) {
+                throw new BundleException("Could not start karaf framwork", e);
+            }
+        }
+
         Map<String, String> properties = new HashMap<String, String>();
 //        properties.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true");
 

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1221385&r1=1221384&r2=1221385&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Tue Dec 20 18:04:06 2011
@@ -41,7 +41,8 @@
                         <id>default</id>
                         <phases>
                             <process-resources>
-                                org.apache.maven.plugins:maven-resources-plugin:resources
+                                org.apache.maven.plugins:maven-resources-plugin:resources,
+                                org.apache.karaf.tooling:karaf-maven-plugin:install-kars
                             </process-resources>
                             <compile>
                                 org.apache.geronimo.buildsupport:car-maven-plugin:validate-configuration,

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1221385&r1=1221384&r2=1221385&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 20 18:04:06 2011
@@ -77,8 +77,9 @@
         <axis2Version>1.6.1_1</axis2Version>
         <axiomVersion>1.2.12_1</axiomVersion>
         <springVersion>2.5.6-SEC02</springVersion>
-        <xbeanVersion>3.8</xbeanVersion>
+        <xbeanVersion>3.9-SNAPSHOT</xbeanVersion>
         <jetty>jetty8</jetty>
+        <jetty.version>8.0.0.M2</jetty.version>
         <txmanagerVersion>3.1.1</txmanagerVersion>
         <tranqlVersion>1.7</tranqlVersion>
         <tranqlDerbyVersion>1.7</tranqlDerbyVersion>
@@ -87,7 +88,6 @@
         <monitoringConsoleVersion>${project.version}</monitoringConsoleVersion>
         <pax.logging.version>1.6.3</pax.logging.version>
         <woodstoxVersion>4.1.2_1</woodstoxVersion>
-        <sxcVersion>0.7.3_1</sxcVersion>
         <yokoVersion>1.3</yokoVersion>
         <juddiv3.version>3.1.0</juddiv3.version>
         <javamail.version>1.8.3</javamail.version>
@@ -374,19 +374,19 @@
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.1.1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.bundles</groupId>
-                        <artifactId>woodstox</artifactId>
-                    </exclusion>
-                </exclusions>                                    
+                <version>1.2-SNAPSHOT</version>
+                <!--<exclusions>-->
+                    <!--<exclusion>-->
+                        <!--<groupId>org.apache.geronimo.bundles</groupId>-->
+                        <!--<artifactId>woodstox</artifactId>-->
+                    <!--</exclusion>-->
+                <!--</exclusions>                                    -->
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
-                <version>1.1.1</version>
+                <version>1.2-SNAPSHOT</version>
                 <classifier>tests</classifier>
             </dependency>
 
@@ -1716,6 +1716,16 @@ only found in cxf
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.shell</artifactId>
                 <version>1.4.2</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -1776,6 +1786,11 @@ only found in cxf
                     </exclusion>
                </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.tooling</groupId>
+                <artifactId>karaf-maven-plugin</artifactId>
+                <version>${karaf.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.karaf.jaas</groupId>
@@ -1788,7 +1803,12 @@ only found in cxf
                 <artifactId>org.apache.karaf.jaas.boot</artifactId>
                 <version>${karaf.version}</version>
             </dependency>
-            
+            <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>org.apache.karaf.main</artifactId>
+                <version>${karaf.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.aries</groupId>
                 <artifactId>org.apache.aries.util</artifactId>



Mime
View raw message