Author: jgallimore
Date: Mon Jan 24 19:17:58 2011
New Revision: 1062932
URL: http://svn.apache.org/viewvc?rev=1062932&view=rev
Log:
OPENEJB-1424 create TomEE bundles for Tomcat 6.0.29 and Tomcat 7.0.6
Added:
openejb/trunk/.gitignore
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/build.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/src/
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
openejb/trunk/openejb3/examples/webapps/ejb-examples/src/main/webapp/WEB-INF/web.xml
Added: openejb/trunk/.gitignore
URL: http://svn.apache.org/viewvc/openejb/trunk/.gitignore?rev=1062932&view=auto
==============================================================================
--- openejb/trunk/.gitignore (added)
+++ openejb/trunk/.gitignore Mon Jan 24 19:17:58 2011
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+.settings
+
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml?rev=1062932&r1=1062931&r2=1062932&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/pom.xml
Mon Jan 24 19:17:58 2011
@@ -1,160 +1,144 @@
<?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. -->
- 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: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec
2007) $
- -->
+<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
<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";>
- <parent>
- <artifactId>openejb-tomcat</artifactId>
- <groupId>org.apache.openejb</groupId>
- <version>3.2-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-tomcat-bundle</artifactId>
- <packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Bundle</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-tomcat-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>download-tomcat</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <property name="OUTPUT_DIR" value="${basedir}/target" />
- <property name="LOCAL_M2_REPO"
value="${settings.localRepository}" />
- <property name="tomcat.version" value="${tomcat.version}" />
- <property name="openejb.version" value="${project.version}" />
- <property name="examples.version" value="${examples.version}"
/>
- <property name="http.proxyHost" value="${http.proxyHost}" />
- <property name="http.proxyPort" value="${http.proxyPort}" />
-
- <ant antfile="${basedir}/build.xml">
- <target name="downloadtomcat" />
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-commons-net</artifactId>
- <version>${ant.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>${ant.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>execute-installer</id>
- <phase>prepare-package</phase>
- <configuration>
-
<mainClass>org.apache.openejb.tomcat.TomcatBundleInstaller</mainClass>
- <arguments>
- <argument>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}/webapps/openejb
- </argument>
- </arguments>
- <systemProperties>
- <systemProperty>
- <key>catalina.home</key>
- <value>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
- </value>
- </systemProperty>
- <systemProperty>
- <key>catalina.base</key>
- <value>
-
${basedir}/target/bundle/extracted/apache-tomcat-${tomcat.version}
- </value>
- </systemProperty>
- </systemProperties>
- </configuration>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>war</id>
- <phase>package</phase>
- <configuration>
-
<finalName>${project.artifactId}-${tomcat.version}-${project.version}</finalName>
- </configuration>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/bundle.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <tomcat.version>6.0.29</tomcat.version>
- <examples.version>1.1-SNAPSHOT</examples.version>
- <ant.version>1.8.1</ant.version>
- </properties>
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <artifactId>openejb-tomcat</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-tomee</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenEJB :: Assembly :: TomEE</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-webapp-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.3</version>
+ <configuration>
+ <scriptpath>
+
<element>${project.basedir}/src/main/groovy</element>
+ </scriptpath>
+ <classpath>
+ <element>
+
<groupId>jline</groupId>
+
<artifactId>jline</artifactId>
+
<version>0.9.94</version>
+ </element>
+ <element>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-tomee-utils</artifactId>
+
<version>${project.version}</version>
+ </element>
+ <element>
+
<groupId>org.apache.ant</groupId>
+
<artifactId>ant-nodeps</artifactId>
+
<version>1.7.1</version>
+ <type>jar</type>
+ </element>
+ </classpath>
+ <defaults>
+
<testSectionsFile>${project.basedir}/sections.properties</testSectionsFile>
+
<logOutputDirectory>${project.build.directory}/logs</logOutputDirectory>
+
<backupLogs>true</backupLogs>
+ </defaults>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomee6</id>
+ <phase>package</phase>
+ <configuration>
+
<appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+
<descriptor>src/main/assembly/tomee.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <properties>
+ <localRepository>${settings.localRepository}</localRepository>
+ <examples.version>1.1-SNAPSHOT</examples.version>
+ </properties>
+
+ <modules>
+ <module>utils</module>
+ <module>tomee6</module>
+ <module>tomee7</module>
+ </modules>
</project>
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/pom.xml
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,138 @@
+<?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: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
+
+<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";>
+ <parent>
+ <artifactId>openejb-tomee</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-tomee-tomcat6</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Assembly :: TomEE :: Tomcat 6</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-webapp-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomee-utils</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>execute-installer</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>new
commands.SetupCommand(this).execute()</source>
+ <classpath>
+ <element>
+
<groupId>jline</groupId>
+
<artifactId>jline</artifactId>
+
<version>0.9.94</version>
+ </element>
+ <element>
+
<groupId>org.apache.ant</groupId>
+
<artifactId>ant-nodeps</artifactId>
+
<version>1.7.1</version>
+
<type>jar</type>
+ </element>
+ <element>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-tomee-utils</artifactId>
+
<version>${project.version}</version>
+ </element>
+ </classpath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <localRepository>${settings.localRepository}</localRepository>
+ <examples.version>1.1-SNAPSHOT</examples.version>
+ <tomcat.version>6.0.29</tomcat.version>
+ <http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
+ <http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
+
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
+
<http.proxy.password>${settings.activeProxy.password}</http.proxy.password>
+
<http.proxy.nonProxyHosts>${settings.activeProxy.nonProxyHosts}</http.proxy.nonProxyHosts>
+ </properties>
+
+
+</project>
+
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee6/src/main/assembly/tomee.xml
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,50 @@
+<?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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>openejb-tomcat6-bundle</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
+ <outputDirectory>/apache-tomee-tomcat-6.0.29</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/bin/**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-6.0.29</directory>
+ <outputDirectory>/apache-tomee-tomcat-6.0.29</outputDirectory>
+ <includes>
+ <include>**/bin/**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,137 @@
+<?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: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
+
+<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";>
+ <parent>
+ <artifactId>openejb-tomee</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-tomee-tomcat7</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Assembly :: TomEE :: Tomcat 7</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-webapp-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomee-utils</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>execute-installer</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>new
commands.SetupCommand(this).execute()</source>
+ <classpath>
+ <element>
+
<groupId>jline</groupId>
+
<artifactId>jline</artifactId>
+
<version>0.9.94</version>
+ </element>
+ <element>
+
<groupId>org.apache.ant</groupId>
+
<artifactId>ant-nodeps</artifactId>
+
<version>1.7.1</version>
+
<type>jar</type>
+ </element>
+ <element>
+
<groupId>org.apache.openejb</groupId>
+
<artifactId>openejb-tomee-utils</artifactId>
+
<version>${project.version}</version>
+ </element>
+ </classpath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <localRepository>${settings.localRepository}</localRepository>
+ <examples.version>1.1-SNAPSHOT</examples.version>
+ <tomcat.version>7.0.6</tomcat.version>
+ <http.proxy.host>${settings.activeProxy.host}</http.proxy.host>
+ <http.proxy.port>${settings.activeProxy.port}</http.proxy.port>
+
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
+
<http.proxy.password>${settings.activeProxy.password}</http.proxy.password>
+
<http.proxy.nonProxyHosts>${settings.activeProxy.nonProxyHosts}</http.proxy.nonProxyHosts>
+ </properties>
+
+</project>
+
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,50 @@
+<?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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>openejb-tomcat6-bundle</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-7.0.6</directory>
+ <outputDirectory>/apache-tomee-tomcat-7.0.6</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/bin/**/*</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-7.0.6</directory>
+ <outputDirectory>/apache-tomee-tomcat-7.0.6</outputDirectory>
+ <includes>
+ <include>**/bin/**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/pom.xml?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/pom.xml
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/pom.xml
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,94 @@
+<?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: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
+
+<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";>
+ <parent>
+ <artifactId>openejb-tomee</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>3.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-tomee-utils</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Assembly :: TomEE :: Utils</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.gmaven.runtime</groupId>
+ <artifactId>gmaven-runtime-1.6</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-webapp-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+
<goal>generateStubs</goal>
+ <goal>compile</goal>
+
<goal>generateTestStubs</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy?rev=1062932&view=auto
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
(added)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
Mon Jan 24 19:17:58 2011
@@ -0,0 +1,148 @@
+/*
+ * 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.
+ */
+
+package commands
+
+import org.apache.commons.lang.SystemUtils
+import org.apache.openejb.webapp.common.Installers
+import org.apache.openejb.webapp.common.Alerts
+import java.io.File
+import org.apache.openejb.tomcat.installer.Installer;
+import org.apache.openejb.tomcat.installer.Paths;
+import org.apache.tools.ant.taskdefs.optional.net.SetProxy
+
+class SetupCommand {
+ def log
+ def ant
+ def project
+
+ def SetupCommand(source) {
+ this.log = source.log
+ this.project = source.project
+ this.ant = new AntBuilder()
+ }
+
+ def get(name) {
+ assert name != null
+
+ def value = project.properties.getProperty(name)
+
+ log.debug("Get property: $name=$value")
+
+ return value
+ }
+
+ def get(name, defaultValue) {
+ def value = get(name)
+
+ if (value == null) {
+ value = defaultValue
+ }
+
+ return value
+ }
+
+ def getBoolean(name, defaultValue) {
+ def value = get(name, defaultValue)
+ return Boolean.valueOf("$value")
+ }
+
+ def require(name) {
+ assert name != null
+
+ log.debug("Require property: $name")
+
+ if (!project.properties.containsKey(name) &&
!System.properties.containsKey(name)) {
+ throw new Exception("Missing required property: $name")
+ }
+
+ def value = get(name)
+
+ if (value == 'null') {
+ throw new Exception("Missing required property: $name
(resolved to null)")
+ }
+
+ return value
+ }
+
+ def execute() {
+ def tomcatVersion = require('tomcat.version')
+ def localRepo = require('localRepository')
+ def openejbHome =
"${project.build.directory}/apache-tomcat-${tomcatVersion}"
+ def examplesVersion = require('examples.version')
+
+ def proxyHost = get('http.proxy.host', '')
+ def proxyPort = get('http.proxy.port', '')
+ def proxyUsername = get('http.proxy.username', '')
+ def proxyPassword = get('http.proxy.password', '')
+ def proxyNonProxyHosts = get('http.proxy.nonProxyHosts', '')
+
+ if ((proxyHost != null && proxyHost.length() > 0) || (proxyPort
!= null && proxyPort.length() > 0)) {
+ ant.echo("Setting proxy host=${proxyHost} and proxy
port=${proxyPort}")
+
+ def setProxy = new SetProxy();
+ setProxy.setProxyHost(proxyHost)
+ setProxy.setProxyPort(Integer.parseInt(proxyPort))
+ setProxy.setProxyUser(proxyUsername)
+ setProxy.setProxyPassword(proxyPassword)
+ setProxy.setNonProxyHosts(proxyNonProxyHosts)
+ setProxy.execute()
+ }
+
+ def source = ""
+ def dest =
"${project.build.directory}/apache-tomcat-${tomcatVersion}.zip"
+ def catalinaHome =
"${project.build.directory}/apache-tomcat-${tomcatVersion}"
+
+ if (tomcatVersion =~ /^7\./) {
+ source =
"http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcatVersion}/bin/apache-tomcat-${tomcatVersion}.zip";
+ }
+
+ if (tomcatVersion =~ /^6\./) {
+ source =
"http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcatVersion}/bin/apache-tomcat-${tomcatVersion}.zip";
+ }
+
+ if (tomcatVersion =~ /^5\.5/) {
+ source =
"http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcatVersion}/bin/apache-tomcat-${tomcatVersion}.zip";
+ }
+
+ ant.get(src: source, dest: dest)
+
+ ant.unzip(src: dest, dest: "${project.build.directory}")
+
+ ant.echo("Deploying the openejb war")
+ ant.unzip(src:
"${localRepo}/org/apache/openejb/openejb-tomcat-webapp/${project.version}/openejb-tomcat-webapp-${project.version}.war",
+ dest:
"${project.build.directory}/apache-tomcat-${tomcatVersion}/webapps/openejb")
+
+ ant.echo("Installing to: ${catalinaHome}")
+
+ System.setProperty("catalina.home", "${catalinaHome}")
+ System.setProperty("catalina.base", "${catalinaHome}")
+ Paths paths = new Paths(new
File("${catalinaHome}/webapps/openejb"))
+ Installer installer = new Installer(paths, true)
+ installer.installAll()
+
+ ant.echo("Assigning execute privileges to scripts in Tomcat bin
directory")
+ ant.chmod(dir:
"${project.build.directory}/apache-tomcat-${tomcatVersion}/bin", perm: "u+x",
includes: "**/*.sh")
+
+ ant.echo("Deploying the examples war")
+ ant.unzip(src:
"${localRepo}/org/superbiz/ejb-examples/${examplesVersion}/ejb-examples-${examplesVersion}.war",
+ dest:
"${project.build.directory}/apache-tomcat-${tomcatVersion}/webapps/ejb-examples")
+ }
+}
+
Modified:
openejb/trunk/openejb3/examples/webapps/ejb-examples/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-examples/src/main/webapp/WEB-INF/web.xml?rev=1062932&r1=1062931&r2=1062932&view=diff
==============================================================================
---
openejb/trunk/openejb3/examples/webapps/ejb-examples/src/main/webapp/WEB-INF/web.xml
(original)
+++
openejb/trunk/openejb3/examples/webapps/ejb-examples/src/main/webapp/WEB-INF/web.xml
Mon Jan 24 19:17:58 2011
@@ -26,7 +26,7 @@
version="2.5">
<display-name>OpenEJB Servlet Examples</display-name>
-
+
<servlet>
<servlet-name>AnnotatedServlet</servlet-name>
<servlet-class>org.superbiz.servlet.AnnotatedServlet</servlet-class>
