Author: djencks
Date: Tue Nov 28 17:54:42 2006
New Revision: 480329
URL: http://svn.apache.org/viewvc?view=rev&rev=480329
Log:
GERONIMO-2604 create a specs car
Added:
geronimo/server/trunk/configs/j2ee-1.4-specs/
- copied from r476125, geronimo/server/trunk/configs/rmi-naming/
geronimo/server/trunk/configs/j2ee-1.4-specs/LICENSE.txt
- copied unchanged from r480282,
geronimo/server/trunk/configs/rmi-naming/LICENSE.txt
geronimo/server/trunk/configs/j2ee-1.4-specs/NOTICE.txt
- copied unchanged from r480282,
geronimo/server/trunk/configs/rmi-naming/NOTICE.txt
geronimo/server/trunk/configs/j2ee-1.4-specs/pom.xml
- copied, changed from r480282,
geronimo/server/trunk/configs/rmi-naming/pom.xml
geronimo/server/trunk/configs/j2ee-1.4-specs/src/
- copied from r480282, geronimo/server/trunk/configs/rmi-naming/src/
Modified:
geronimo/server/trunk/configs/client/pom.xml
geronimo/server/trunk/configs/j2ee-1.4-specs/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-server/pom.xml
geronimo/server/trunk/configs/pom.xml
geronimo/server/trunk/configs/rmi-naming/pom.xml
Modified: geronimo/server/trunk/configs/client/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=480329&r1=480328&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Tue Nov 28 17:54:42 2006
@@ -42,6 +42,12 @@
<version>${version}</version>
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-1.4-specs</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
<!-- ThreadPool -->
<dependency>
@@ -120,76 +126,6 @@
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.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-jaxr_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
-
- <!--dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
-
- <!-- required for the jaxrpc apis -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- </dependency>
<!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
<!-- openejb-core, tranql, asm, activemq,
Copied: geronimo/server/trunk/configs/j2ee-1.4-specs/pom.xml (from r480282,
geronimo/server/trunk/configs/rmi-naming/pom.xml)
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-1.4-specs/pom.xml?view=diff&rev=480329&p1=geronimo/server/trunk/configs/rmi-naming/pom.xml&r1=480282&p2=geronimo/server/trunk/configs/j2ee-1.4-specs/pom.xml&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-1.4-specs/pom.xml Tue Nov 28 17:54:42
2006
@@ -30,20 +30,13 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>rmi-naming</artifactId>
- <name>Geronimo Configs :: RMI Naming</name>
+ <artifactId>j2ee-1.4-specs</artifactId>
+ <name>Geronimo Configs :: J2EE 1.4 specs</name>
<packaging>car</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>j2ee-system</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
@@ -114,48 +107,6 @@
<artifactId>geronimo-servlet_2.4_spec</artifactId>
</dependency>
- <!-- thread pool has management interface -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-interceptor</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${version}</version>
- </dependency>
-
- <!-- remote login -->
- <dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/configs/j2ee-1.4-specs/src/plan/plan.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-1.4-specs/src/plan/plan.xml?view=diff&rev=480329&r1=480282&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/j2ee-1.4-specs/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-1.4-specs/src/plan/plan.xml Tue Nov 28
17:54:42 2006
@@ -20,81 +20,4 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
- <gbean name="RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
- <attribute name="port">${PlanNamingPort}</attribute>
- </gbean>
-
- <gbean name="NamingProperties"
class="org.apache.geronimo.system.properties.NamingProperties">
- <attribute
name="namingFactoryInitial">org.apache.xbean.naming.global.GlobalContextManager</attribute>
- <attribute
name="namingFactoryUrlPkgs">org.apache.xbean.naming</attribute>
- <attribute
name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
- </gbean>
-
- <gbean name="GlobalContext"
class="org.apache.geronimo.gjndi.GlobalContextGBean"/>
-
- <gbean name="JavaCompContext"
class="org.apache.geronimo.gjndi.JavaCompContextGBean"/>
-
- <gbean name="JavaContext"
class="org.apache.geronimo.gjndi.WritableContextGBean">
- <attribute name="nameInNamespace">java:</attribute>
- </gbean>
-
- <gbean name="SystemProperties"
class="org.apache.geronimo.system.properties.SystemProperties">
- <attribute name="systemProperties" />
- <attribute name="systemPathProperties" />
- <!-- Can we get by without this?
- <attribute name="systemProperties">
- javax.net.ssl.keyStorePassword=secret
- javax.net.ssl.trustStorePassword=secret
- </attribute>
- <attribute name="systemPathProperties">
- javax.net.ssl.keyStore=var/security/keystores/geronimo-default
- javax.net.ssl.trustStore=var/security/keystores/geronimo-default
- </attribute>
- -->
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-
- <gbean name="MBeanServerReference"
class="org.apache.geronimo.system.jmx.RealMBeanServerReference"/>
-
- <!-- MBean server service -->
- <gbean name="MBeanServerKernelBridge"
class="org.apache.geronimo.system.jmx.MBeanServerKernelBridge">
- <reference name="MBeanServerReference">
- <name>MBeanServerReference</name>
- </reference>
- </gbean>
-
- <gbean name="DefaultThreadPool"
class="org.apache.geronimo.pool.ThreadPool">
- <attribute name="keepAliveTime">5000</attribute>
- <attribute name="poolSize">300</attribute>
- <attribute name="poolName">DefaultThreadPool</attribute>
- </gbean>
-
- <!-- Configuration Installer -->
- <gbean name="PluginInstaller"
class="org.apache.geronimo.system.plugin.PluginInstallerGBean">
- <reference name="Repository">
- <name>Repository</name>
- </reference>
- <reference name="ConfigStore">
- <name>Local</name>
- </reference>
- <reference name="ConfigManager">
- <name>ConfigurationManager</name>
- </reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- <reference name="ThreadPool">
- <name>DefaultThreadPool</name>
- </reference>
- <reference name="PluginAttributeStore">
- <name>AttributeManager</name>
- </reference>
- </gbean>
-
- <gbean name="DownloadedPluginRepos"
class="org.apache.geronimo.system.plugin.PluginRepositoryDownloader">
- <attribute
name="repositoryList">http://people.apache.org/~ammulder/plugin-repository-list.txt</attribute>
- </gbean>
-
</module>
Modified: geronimo/server/trunk/configs/j2ee-server/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/pom.xml?view=diff&rev=480329&r1=480328&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Tue Nov 28 17:54:42 2006
@@ -41,7 +41,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+
<!-- ThreadPool -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/trunk/configs/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=480329&r1=480328&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Nov 28 17:54:42 2006
@@ -131,6 +131,7 @@
<module>directory</module>
<module>geronimo-gbean-deployer</module>
<module>hot-deployer</module>
+ <module>j2ee-1.4-specs</module>
<module>j2ee-corba-yoko</module>
<module>j2ee-deployer</module>
<module>j2ee-security</module>
Modified: geronimo/server/trunk/configs/rmi-naming/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/rmi-naming/pom.xml?view=diff&rev=480329&r1=480328&r2=480329
==============================================================================
--- geronimo/server/trunk/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/configs/rmi-naming/pom.xml Tue Nov 28 17:54:42 2006
@@ -44,74 +44,10 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.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-jaxr_1.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- </dependency>
-
- <!-- qname is in j2ee-system module-->
- <!--dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>j2ee-1.4-specs</artifactId>
+ <version>${version}</version>
+ <type>car</type>
</dependency>
<!-- thread pool has management interface -->