You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2011/05/05 01:35:29 UTC
svn commit: r1099639 - in /geronimo/server/branches/3.0-osgi:
framework/features/j2ee-system/ plugins/ plugins/j2ee/j2ee-deployer/
plugins/j2ee/j2ee-server/ plugins/system-database/ plugins/tomcat/
plugins/tomcat/tomcat7-deployer/ plugins/tomcat/tomcat7/
Author: djencks
Date: Wed May 4 23:35:29 2011
New Revision: 1099639
URL: http://svn.apache.org/viewvc?rev=1099639&view=rev
Log:
j2ee and tomcat build by themselves
Modified:
geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml
geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml
geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/pom.xml
geronimo/server/branches/3.0-osgi/plugins/pom.xml
geronimo/server/branches/3.0-osgi/plugins/system-database/pom.xml
geronimo/server/branches/3.0-osgi/plugins/tomcat/pom.xml
geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml
geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
Modified: geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/framework/features/j2ee-system/pom.xml Wed May 4 23:35:29 2011
@@ -223,11 +223,15 @@
<artifactId>karaf-maven-plugin</artifactId>
<configuration>
<startLevel>50</startLevel>
+ <features>
+ <feature>declarative-services</feature>
+ </features>
+ <aggregateFeatures>true</aggregateFeatures>
+
<checkDependencyChange>true</checkDependencyChange>
<warnOnDependencyChange>true</warnOnDependencyChange>
<logDependencyChanges>true</logDependencyChanges>
<!--<overwriteChangedDependencies>true</overwriteChangedDependencies>-->
- <aggregateFeatures>true</aggregateFeatures>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-deployer/pom.xml Wed May 4 23:35:29 2011
@@ -38,10 +38,6 @@
</description>
<dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-activation_1.1_spec</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework.feature</groupId>
<artifactId>j2ee-system</artifactId>
@@ -62,98 +58,6 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-servlet_3.0_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.components</groupId>-->
- <!--<artifactId>geronimo-jaspi</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jacc_1.4_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jaspic_1.0_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.bundles</groupId>-->
- <!--<artifactId>sxc-jaxb</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.bundles</groupId>-->
- <!--<artifactId>sxc-runtime</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jta_1.1_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-annotation_1.1_spec</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jcdi_1.0_spec</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-interceptor_1.1_spec</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-atinject_1.0_spec</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-el_2.2_spec</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-validation_1.0_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-ejb_3.1_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jaxrpc_1.1_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-saaj_1.3_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jpa_2.0_spec</artifactId>-->
- <!--</dependency>-->
-
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-naming</artifactId>
@@ -169,58 +73,12 @@
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>server-security-config</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.schema</groupId>-->
- <!--<artifactId>geronimo-schema-javaee_6</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.schema</groupId>-->
- <!--<artifactId>geronimo-schema-jee_5</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.schema</groupId>-->
- <!--<artifactId>geronimo-schema-j2ee_1.4</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-client</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
-
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-test-ddbean</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<scope>test</scope>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>geronimo-security</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
@@ -230,25 +88,11 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
<version>${project.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.xbean</groupId>-->
- <!--<artifactId>xbean-naming</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>geronimo-management</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
@@ -325,27 +169,13 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<features>
+ <feature>declarative-services</feature>
<feature>org.apache.geronimo.jaxb-support</feature>
<feature>org.apache.geronimo.javaee-specs</feature>
<feature>j2ee-system</feature>
<feature>server-security-config</feature>
</features>
<category>JavaEE deployment</category>
- <!--<dependencies>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>j2ee-server</artifactId>-->
- <!--<type>car</type>-->
- <!--<import>classes</import>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>server-security-config</artifactId>-->
- <!--<type>car</type>-->
- <!--<import>classes</import>-->
- <!--</dependency>-->
- <!--</dependencies>-->
-
<instance>
<plugin-artifact>
<config-xml-content>
Modified: geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/j2ee/j2ee-server/pom.xml Wed May 4 23:35:29 2011
@@ -178,6 +178,13 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>JavaEE</category>
+ <!--<features>-->
+ <!--<feature>declarative-services</feature>-->
+ <!--<feature>org.apache.geronimo.jaxb-support</feature>-->
+ <!--<feature>org.apache.geronimo.javaee-specs</feature>-->
+ <!--<feature>j2ee-system</feature>-->
+ <!--<feature>server-security-config</feature>-->
+ <!--</features>-->
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/branches/3.0-osgi/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/pom.xml Wed May 4 23:35:29 2011
@@ -150,43 +150,43 @@
</build>
<modules>
+ <module>tomcat</module>
<!-- MNG-4052 modules used as import-scope need to be before anything that uses them -->
- <module>pluto</module>
+ <!--<module>pluto</module>-->
<module>system-database</module>
- <module>activemq</module>
- <module>aspectj</module>
- <module>axis</module>
- <module>axis2</module>
- <module>client</module>
- <module>clustering</module>
+ <!--<module>activemq</module>-->
+ <!--<module>aspectj</module>-->
+ <!--<module>axis</module>-->
+ <!--<module>axis2</module>-->
+ <!--<module>client</module>-->
+ <!--<module>clustering</module>-->
<!--<module>connector-1_6</module>-->
- <module>console</module>
- <module>corba</module>
- <module>cxf</module>
- <module>dojo</module>
- <module>debugviews</module>
- <module>hotdeploy</module>
+ <!--<module>console</module>-->
+ <!--<module>corba</module>-->
+ <!--<module>cxf</module>-->
+ <!--<module>dojo</module>-->
+ <!--<module>debugviews</module>-->
+ <!--<module>hotdeploy</module>-->
<module>j2ee</module>
<module>jasper</module>
<module>javamail</module>
- <module>jaxws</module>
+ <!--<module>jaxws</module>-->
<module>myfaces</module>
<module>openejb</module>
<module>openjpa2</module>
<module>openwebbeans</module>
- <module>wink</module>
+ <!--<module>wink</module>-->
<module>plancreator</module>
- <module>webservices</module>
+ <!--<module>webservices</module>-->
<!--<module>ca-helper</module>-->
- <module>uddi</module>
+ <!--<module>uddi</module>-->
<module>mejb</module>
<!--<module>monitoring</module>-->
- <module>remote-deploy</module>
+ <!--<module>remote-deploy</module>-->
<!--<module>sharedlib</module>-->
- <module>welcome</module>
+ <!--<module>welcome</module>-->
<module>procrun</module>
- <module>jetty8</module>
- <module>tomcat</module>
+ <!--<module>jetty8</module>-->
<module>aries</module>
<module>wab</module>
<module>bval</module>
Modified: geronimo/server/branches/3.0-osgi/plugins/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/system-database/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/system-database/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/system-database/pom.xml Wed May 4 23:35:29 2011
@@ -39,9 +39,9 @@
<modules>
<module>geronimo-derby</module>
<module>system-database</module>
- <module>sysdb-portlets</module>
- <module>sysdb-console-jetty</module>
- <module>sysdb-console-tomcat</module>
+ <!--<module>sysdb-portlets</module>-->
+ <!--<module>sysdb-console-jetty</module>-->
+ <!--<module>sysdb-console-tomcat</module>-->
</modules>
<profiles>
Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/pom.xml Wed May 4 23:35:29 2011
@@ -42,10 +42,10 @@
<module>tomcat7</module>
<module>tomcat7-no-ha</module>
<module>tomcat7-deployer</module>
- <module>geronimo-tomcat7-clustering-wadi</module>
- <module>geronimo-tomcat7-clustering-builder-wadi</module>
- <module>tomcat7-clustering-wadi</module>
- <module>tomcat7-clustering-builder-wadi</module>
+ <!--<module>geronimo-tomcat7-clustering-wadi</module>-->
+ <!--<module>geronimo-tomcat7-clustering-builder-wadi</module>-->
+ <!--<module>tomcat7-clustering-wadi</module>-->
+ <!--<module>tomcat7-clustering-builder-wadi</module>-->
</modules>
<!--<properties>-->
<!--<tomcatVersion>7.0.0.2-SNAPSHOT</tomcatVersion>-->
Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7-deployer/pom.xml Wed May 4 23:35:29 2011
@@ -37,25 +37,38 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>javaee-builder-support</artifactId>
+ <groupId>org.apache.geronimo.feature</groupId>
+ <artifactId>org.apache.geronimo.javaee-specs</artifactId>
<version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework.feature</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>kar</type>-->
+ <!--</dependency>-->
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>j2ee-server</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
<!--ResourceEnvironmentSetter-->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector-builder-1_6</artifactId>
<version>${project.version}</version>
- <type>car</type>
</dependency>
<!-- import classes -->
@@ -114,24 +127,19 @@
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>org.apache.geronimo.configs/javaee-builder-support/${project.version}/car</deploymentConfig>
- </deploymentConfigs>
+ <features>
+ <feature>declarative-services</feature>
+ <feature>org.apache.geronimo.jaxb-support</feature>
+ <feature>org.apache.geronimo.javaee-specs</feature>
+ <feature>j2ee-system</feature>
+ <!--<feature>server-security-config</feature>-->
+ </features>
<category>Tomcat</category>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7</artifactId>
- <type>car</type>
- <import>classes</import>
- </dependency>
- </dependencies>
<instance>
<plugin-artifact>
<config-xml-content server="default" />
<config-xml-content server="offline" />
- <copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>
+ <!--<copy-file dest-dir="schema">schema/schemaorg_apache_xmlbeans/src/</copy-file>-->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml?rev=1099639&r1=1099638&r2=1099639&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/tomcat/tomcat7/pom.xml Wed May 4 23:35:29 2011
@@ -50,12 +50,12 @@
<type>xml</type>
<classifier>features</classifier>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework.feature</groupId>
- <artifactId>server-security-config</artifactId>
- <version>${project.version}</version>
- <type>kar</type>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+ <!--<artifactId>server-security-config</artifactId>-->
+ <!--<version>${project.version}</version>-->
+ <!--<type>kar</type>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -126,10 +126,11 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<features>
+ <feature>declarative-services</feature>
<feature>org.apache.geronimo.jaxb-support</feature>
<feature>org.apache.geronimo.javaee-specs</feature>
<feature>j2ee-system</feature>
- <feature>server-security-config</feature>
+ <!--<feature>server-security-config</feature>-->
</features>
<category>Tomcat</category>
<instance>