geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r902507 [3/3] - in /geronimo/server/trunk: framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/ framework/modules/geronimo-deployment/src/test/java/org/apache/geronimo/deployment/ plugins/ plugins/axis/geronim...
Date Sat, 23 Jan 2010 23:28:13 GMT
Modified: geronimo/server/trunk/plugins/wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/pom.xml?rev=902507&r1=902506&r2=902507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/pom.xml Sat Jan 23 23:28:10 2010
@@ -38,6 +38,8 @@
     <modules>
         <module>geronimo-web-extender</module>
         <module>web-extender</module>
+        <module>web-tomcat-server</module>
+        <module>web-jetty-server</module>
     </modules>
 
     <dependencyManagement>

Modified: geronimo/server/trunk/plugins/wab/web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/pom.xml?rev=902507&r1=902506&r2=902507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/pom.xml Sat Jan 23 23:28:10 2010
@@ -34,6 +34,14 @@
     <packaging>car</packaging>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.aries.web</groupId>
             <artifactId>org.apache.aries.web.urlhandler</artifactId>

Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=902507&r1=902506&r2=902507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Sat Jan
23 23:28:10 2010
@@ -17,13 +17,133 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.components</groupId>
+        <artifactId>geronimo-jaspi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>j2ee-server</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deployment</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-service-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-j2ee-schema</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-security-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-web-2.5-builder</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-web-extender</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.ops4j.pax.logging</groupId>
-        <artifactId>pax-logging-api</artifactId>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-j2ee_1.4</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.schema</groupId>
+        <artifactId>geronimo-schema-jee_5</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jacc_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaspic_1.0_spec</artifactId>
+        <type>jar</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.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.specs</groupId>
+        <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/plan/plan.xml?rev=902507&r1=902506&r2=902507&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-extender/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-extender/src/main/plan/plan.xml Sat Jan 23 23:28:10
2010
@@ -18,5 +18,20 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    <gbean name="WebBuilder" class="org.apache.geronimo.osgi.web.WebContainerExtender">
+        <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
+        <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>
+        <attribute name="corbaGBeanAbstractName">?name=Server</attribute>
+        <attribute name="globalContextAbstractName">?name=JavaGlobalContext</attribute>
+        <attribute name="serverName">?j2eeType=J2EEServer#org.apache.geronimo.management.geronimo.J2EEServer</attribute>
+        <references name="WebModuleBuilders">
+            <pattern>
+                <name>JettyWebBuilder</name>
+            </pattern>
+            <pattern>
+                <name>TomcatWebBuilder</name>
+            </pattern>
+        </references>
+    </gbean>
 
 </module>

Added: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml?rev=902507&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml Sat Jan 23 23:28:10 2010
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>wab</artifactId>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo.plugins</groupId>
+  <artifactId>web-jetty-server</artifactId>
+  <packaging>server-assembly</packaging>
+  <name>Geronimo Plugins, WAB :: Web Extender Jetty Server</name>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.geronimo.buildsupport</groupId>
+          <artifactId>car-maven-plugin</artifactId>
+          <version>${version}</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>car-maven-plugin</artifactId>
+        <configuration>
+          <servers>
+            <serverInstance>
+              <name>default</name>
+              <configFile>var/config/config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>client</name>
+              <attributeManagerFrom>default</attributeManagerFrom>
+              <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>offline</name>
+              <configFile>var/config/offline-deployer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>jsr88</name>
+              <configFile>var/config/jsr88-configurer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+          </servers>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.framework</groupId>
+      <artifactId>karaf-framework</artifactId>
+      <version>${version}</version>
+      <type>car</type>
+    </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>web-extender</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty8</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetty8-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+  </dependencies>
+</project>

Propchange: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml?rev=902507&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml (added)
+++ geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml Sat Jan 23 23:28:10 2010
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>wab</artifactId>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.geronimo.plugins</groupId>
+  <artifactId>web-tomcat-server</artifactId>
+  <packaging>server-assembly</packaging>
+  <name>Geronimo Plugins, WAB :: Web Extender Tomcat Server</name>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.geronimo.buildsupport</groupId>
+          <artifactId>car-maven-plugin</artifactId>
+          <version>${version}</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.buildsupport</groupId>
+        <artifactId>car-maven-plugin</artifactId>
+        <configuration>
+          <servers>
+            <serverInstance>
+              <name>default</name>
+              <configFile>var/config/config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>client</name>
+              <attributeManagerFrom>default</attributeManagerFrom>
+              <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>offline</name>
+              <configFile>var/config/offline-deployer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+            <serverInstance>
+              <name>jsr88</name>
+              <configFile>var/config/jsr88-configurer-config.xml</configFile>
+              <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+              <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+              <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+            </serverInstance>
+          </servers>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo.framework</groupId>
+      <artifactId>karaf-framework</artifactId>
+      <version>${version}</version>
+      <type>car</type>
+    </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>web-extender</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>transaction-1_6</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat7-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+  </dependencies>
+</project>

Propchange: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message