geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r831105 - in /geronimo/server/trunk/framework: buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ configs/geronimo-gbean-deployer/src/main/history/ configs/gshell-geronimo/src/main/history/ configs/gshell-remo...
Date Thu, 29 Oct 2009 21:48:03 GMT
Author: gawor
Date: Thu Oct 29 21:48:02 2009
New Revision: 831105

URL: http://svn.apache.org/viewvc?rev=831105&view=rev
Log:
generate much saner dependency information and reduce number of packages exported via system
bundle in car maven plugin

Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml

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=831105&r1=831104&r2=831105&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
Thu Oct 29 21:48:02 2009
@@ -381,7 +381,7 @@
 
             getDependencies(project, useMavenDependencies.isUseTransitiveDependencies());
             for (Map.Entry<Artifact, Set<Artifact>> entry : localDependencies.entrySet())
{
-                toDependencyType(entry.getKey(), explicitDependencyMap, localDependencies,
useMavenDependencies.isIncludeVersion(), includeImport, dependencies);
+                dependencies.add(toDependencyType(entry.getKey(), explicitDependencyMap,
localDependencies, useMavenDependencies.isIncludeVersion(), includeImport));
 //                Artifact artifact = entry.getKey();
 //                DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
 //                DependencyType dependency = toDependencyType(artifact, useMavenDependencies.isIncludeVersion(),
explicitDependency, includeImport);
@@ -398,16 +398,15 @@
         return dependencies;
     }
 
-    DependencyType toDependencyType(Artifact artifact, Map<String, DependencyType>
explicitDependencyMap, Map<Artifact, Set<Artifact>> localDependencies, boolean
includeVersion, boolean includeImport, LinkedHashSet<DependencyType> dependencies) {
+    DependencyType toDependencyType(Artifact artifact, Map<String, DependencyType>
explicitDependencyMap, Map<Artifact, Set<Artifact>> localDependencies, boolean
includeVersion, boolean includeImport) {
         DependencyType explicitDependency = explicitDependencyMap.get(getKey(artifact));
         DependencyType dependency = toDependencyType(artifact, includeVersion, explicitDependency,
includeImport);
         Set<Artifact> artifactSet = localDependencies.get(artifact);
         if (artifactSet != null) {
             for (Artifact parent : artifactSet) {
-                dependency.getDependency().add(toDependencyType(parent, explicitDependencyMap,
localDependencies, includeVersion, includeImport, dependencies));
+                dependency.getDependency().add(toDependencyType(parent, explicitDependencyMap,
localDependencies, includeVersion, includeImport));
             }
         }
-        dependencies.add(dependency);
         return dependency;
     }
 
@@ -640,6 +639,7 @@
         
         Map<String, String> properties = new HashMap<String, String>();
 //        properties.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true");
+
         properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA,
                         "net.sf.cglib.asm," +
                         "net.sf.cglib.core," +
@@ -690,11 +690,14 @@
                         "org.apache.geronimo.system.sharedlib," +
                         "org.apache.geronimo.system.threads," +
                         "org.apache.geronimo.system.util," +
+                        "org.apache.geronimo.mavenplugins.car," +
+                       "");
+                        /*
+
                         "org.apache.log4j;version=\"1.2.12\"," +
                         "org.apache.log4j.helpers;version=\"1.2.12\"," +
                         "org.apache.log4j.spi;version=\"1.2.12\"," +
                         "org.apache.log4j.xml;version=\"1.2.12\"," +
-                        "org.apache.geronimo.mavenplugins.car," +
 
                         "org.codehaus.classworlds," +
                         "org.codehaus.classworlds.realm," +
@@ -774,6 +777,7 @@
                         "javax.enterprise.deploy.model," +
                         "javax.enterprise.deploy.shared," +
                         "javax.enterprise.deploy.spi");
+*/
         properties.put(BundleCache.CACHE_ROOTDIR_PROP, basedir + "/target");
         Framework framework = new FrameworkFactory().newFramework(properties);
         framework.start();

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
Thu Oct 29 21:48:02 2009
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>commons-cli</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
@@ -33,30 +28,15 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-service-builder</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>
@@ -72,11 +52,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.servicemix.specs</groupId>
-        <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Thu Oct 29 21:48:02 2009
@@ -107,16 +107,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-command-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-remote/src/main/history/dependencies.xml
Thu Oct 29 21:48:02 2009
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.gshell</groupId>
         <artifactId>gshell-whisper</artifactId>
         <type>jar</type>
     </dependency>
@@ -42,11 +37,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.gshell.support</groupId>
-        <artifactId>gshell-common</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
         <type>jar</type>
@@ -56,24 +46,4 @@
         <artifactId>mina-filter-ssl</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-annotations</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-component-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-utils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
Thu Oct 29 21:48:02 2009
@@ -18,21 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-management</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-security</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
@@ -61,9 +51,4 @@
         <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/plugin/src/main/history/dependencies.xml Thu Oct
29 21:48:02 2009
@@ -13,11 +13,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
@@ -31,19 +26,4 @@
         <artifactId>org.apache.servicemix.bundles.ant</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.specs</groupId>
-        <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Thu
Oct 29 21:48:02 2009
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-management</artifactId>
         <type>jar</type>
     </dependency>
@@ -33,11 +28,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>j2ee-system</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
Thu Oct 29 21:48:02 2009
@@ -18,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-upgrade</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml?rev=831105&r1=831104&r2=831105&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade/src/main/history/dependencies.xml Thu
Oct 29 21:48:02 2009
@@ -13,11 +13,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-service-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-upgrade</artifactId>
         <type>jar</type>
     </dependency>



Mime
View raw message