geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r952773 - in /geronimo/server/trunk/assemblies: ./ geronimo-jetty8-eba/ geronimo-jetty8-javaee6-web/ geronimo-tomcat7-eba/ geronimo-tomcat7-javaee6-web/
Date Tue, 08 Jun 2010 19:10:17 GMT
Author: dwoods
Date: Tue Jun  8 19:10:17 2010
New Revision: 952773

URL: http://svn.apache.org/viewvc?rev=952773&view=rev
Log:
add web profile assemblies and commented out examples of EBA assemblies to replace minimal
assemblies

Added:
    geronimo/server/trunk/assemblies/geronimo-jetty8-eba/
    geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml   (with props)
    geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/
    geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml   (with props)
    geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/
    geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml   (with props)
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/
    geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml   (with props)
Modified:
    geronimo/server/trunk/assemblies/pom.xml

Added: geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml?rev=952773&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml Tue Jun  8 19:10:17 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 951196 $ $Date: 2010-06-03 19:07:16 -0400 (Thu, 03 Jun 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-jetty8-eba</artifactId>
+    <name>Geronimo Assemblies :: EBA + Jetty8</name>
+    <packaging>server-assembly</packaging>
+
+    <description>
+        An OSGi (Blueprint + RF66) focused Geronimo server assembly using the Jetty web-container.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>eba-jetty</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty8-eba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml?rev=952773&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml Tue Jun  8 19:10:17
2010
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 942493 $ $Date: 2010-05-09 02:36:39 -0400 (Sun, 09 May 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-jetty8-javaee6-web</artifactId>
+    <name>Geronimo Assemblies :: Java EE 6 Web Profile + Jetty8</name>
+    <packaging>server-assembly</packaging>
+
+    <description>
+        An assembly of Geronimo into a Java EE 6 Web Profile server assembly using Jetty
as the web container.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>javaee6-web-jetty</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+<!-- Needs to be reworked to support the new karaf shell
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-wsgen.properties" />
+                                </java>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-cxf-tools.properties" />
+                                </java>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+-->
+
+</project>

Propchange: geronimo/server/trunk/assemblies/geronimo-jetty8-javaee6-web/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml?rev=952773&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml Tue Jun  8 19:10:17 2010
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 951196 $ $Date: 2010-06-03 19:07:16 -0400 (Thu, 03 Jun 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-tomcat7-eba</artifactId>
+    <name>Geronimo Assemblies :: EBA + Tomcat7</name>
+    <packaging>server-assembly</packaging>
+
+    <description>
+        An OSGi (Blueprint + RF66) focused Geronimo server assembly using the Tomcat web-container.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>eba-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: geronimo/server/trunk/assemblies/geronimo-tomcat7-eba/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml?rev=952773&view=auto
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml (added)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml Tue Jun  8 19:10:17
2010
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 942493 $ $Date: 2010-05-09 02:36:39 -0400 (Sun, 09 May 2010) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.assemblies</groupId>
+        <artifactId>assemblies</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>geronimo-tomcat7-javaee6-web</artifactId>
+    <name>Geronimo Assemblies :: Java EE 6 Web Profile + Tomcat7</name>
+    <packaging>server-assembly</packaging>
+
+    <description>
+        An assembly of Geronimo into a Java EE 6 Web Profile server assembly using Tomcat
as the web container.
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.plugingroups</groupId>
+            <artifactId>javaee6-web-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+    </dependencies>
+
+<!-- Needs to be reworked to support the new karaf shell
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-wsgen.properties" />
+                                </java>
+                                <java classname="org.apache.geronimo.jaxws.builder.GShellCommandRegistration"
fork="yes" failonerror="true">
+                                   <classpath refid="maven.runtime.classpath" />
+                                   <arg value="${project.build.directory}/assembly" />
+                                   <arg value="gsh-cxf-tools.properties" />
+                                </java>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+-->
+
+</project>

Propchange: geronimo/server/trunk/assemblies/geronimo-tomcat7-javaee6-web/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=952773&r1=952772&r2=952773&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Tue Jun  8 19:10:17 2010
@@ -35,8 +35,12 @@
 
     <modules>
         <module>geronimo-jetty8-minimal</module>
+        <!-- <module>geronimo-jetty8-eba</module> -->
+        <module>geronimo-jetty8-javaee6-web</module>
         <module>geronimo-jetty8-javaee6</module>
         <module>geronimo-tomcat7-minimal</module>
+        <!-- <module>geronimo-tomcat7-eba</module> -->
+        <module>geronimo-tomcat7-javaee6-web</module>
         <module>geronimo-tomcat7-javaee6</module>
     </modules>
 



Mime
View raw message