geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1053549 [2/2] - in /geronimo/devtools/eclipse-plugin/branches/2.2: ./ assembly/ features/ features/org.apache.geronimo.v22.feature/ plugins/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/ plugins/org.apache.geronimo.jee.v21.jaxbmodel/ plu...
Date Wed, 29 Dec 2010 07:04:20 GMT
Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
Wed Dec 29 07:04:19 2010
@@ -1,185 +1,184 @@
-<?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.
-  -->
-
-<!-- @version $Rev: 678021 $ $Date: 2008-07-18 13:18:23 -0700 (Fri, 18 Jul 2008) $ -->
-
-<project>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>org.apache.geronimo.testsuite.v20</artifactId>
-    <packaging>jar</packaging>
-    <version>2.2.1</version>
-    <name>${artifactId}</name>
-
-    <parent>
-        <groupId>org.apache.geronimo.devtools</groupId>
-        <artifactId>testsuite-plugins</artifactId>
-        <version>2.2.1</version>
-    </parent>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>.</directory>
-                <includes>
-                    <include>test.xml</include>
-                    <include>plugin.xml</include>
-                    <include>plugin.properties</include>
-                </includes>
-            </resource>
-
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>.</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <groupId>org.apache.geronimo.devtools</groupId>
-                <artifactId>maven-eclipsepde-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>            
-
-            <!-- Exclude tutorial java files -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/MyServlet.java</exclude>
-                        <exclude>**/MyStatelessSessionBean.java</exclude>
-                        <exclude>**/RemoteBusinessInterface.java</exclude>
-                    </excludes>
-                </configuration>
-             </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>eclipse</artifactId>
-            <version>${version}</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.st.v20.core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.common</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.runtime.v20</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>abbot</groupId>
-            <artifactId>abbot.swt</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>abbot</groupId>
-            <artifactId>abbot.swt.eclipse</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.testsuite.common</artifactId>
-            <version>${version}</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <!--
-                     |
-                     | Unzip the resulting plugin jar into the launcher eclipse directory
for later usage
-                     |
-                     -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <tasks>
-                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v20-2.2.1"/>
-                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v20-2.2.1.jar"
-                                              dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v20-2.2.1"/>
-                                    </tasks>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>allsubproject</id>
-        </profile>
-    </profiles>
-    
-</project>
+<?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.
+  -->
+
+<!-- @version $Rev: 678021 $ $Date: 2008-07-18 13:18:23 -0700 (Fri, 18 Jul 2008) $ -->
+
+<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>
+
+    <groupId>org.apache.geronimo.devtools</groupId>
+    <artifactId>org.apache.geronimo.testsuite.v20</artifactId>
+    <packaging>jar</packaging>
+    <version>2.2.1</version>
+    <name>${artifactId}</name>
+
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>testsuite-plugins</artifactId>
+        <version>2.2.1</version>
+    </parent>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>test.xml</include>
+                    <include>plugin.xml</include>
+                    <include>plugin.properties</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>.</directory>
+                <includes>
+                    <include>LICENSE</include>
+                    <include>NOTICE</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>            
+
+            <!-- Exclude tutorial java files -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/MyServlet.java</exclude>
+                        <exclude>**/MyStatelessSessionBean.java</exclude>
+                        <exclude>**/RemoteBusinessInterface.java</exclude>
+                    </excludes>
+                </configuration>
+             </plugin>
+
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>${version}</version>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.st.core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.st.v20.core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.runtime.common</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.runtime.v20</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>abbot</groupId>
+            <artifactId>abbot.swt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>abbot</groupId>
+            <artifactId>abbot.swt.eclipse</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.testsuite.common</artifactId>
+            <version>${version}</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <!--
+                     |
+                     | Unzip the resulting plugin jar into the launcher eclipse directory
for later usage
+                     |
+                     -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <tasks>
+                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v20-2.2.1"
/>
+                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v20-2.2.1.jar"
dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v20-2.2.1"
/>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>allsubproject</id>
+        </profile>
+    </profiles>
+    
+</project>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
Wed Dec 29 07:04:19 2010
@@ -18,7 +18,7 @@
 
 <!-- @version $Rev$ $Date$ -->
 
-<project>
+<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>
 
@@ -166,9 +166,8 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v21-2.2.1"/>
-                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v21-2.2.1.jar"
-                                              dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v21-2.2.1"/>
+                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v21-2.2.1"
/>
+                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v21-2.2.1.jar"
dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v21-2.2.1"
/>
                                     </tasks>
                                 </configuration>
                             </execution>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
Wed Dec 29 07:04:19 2010
@@ -18,7 +18,7 @@
 
 <!-- @version $Rev$ $Date$ -->
 
-<project>
+<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>
 
@@ -180,9 +180,8 @@
                                 </goals>
                                 <configuration>
                                     <tasks>
-                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.1"/>
-                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v22-2.2.1.jar"
-                                              dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.1"/>
+                                        <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.1"
/>
+                                        <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v22-2.2.1.jar"
dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.1"
/>
                                     </tasks>
                                 </configuration>
                             </execution>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/plugins/pom.xml Wed Dec 29 07:04:19
2010
@@ -18,7 +18,7 @@
         
 <!-- @version $Rev$ $Date$ -->
         
-<project>
+<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>
         
@@ -80,8 +80,8 @@
                             <phase>process-sources</phase>
                             <configuration>
                                 <tasks>
-                                    <copy file="${basedir}/.classpath" todir="${project.build.directory}"
overwrite="false" failonerror="false"/>
-                                    <copy file="${basedir}/.project" todir="${project.build.directory}"
overwrite="false" failonerror="false"/>
+                                    <copy file="${basedir}/.classpath" todir="${project.build.directory}"
overwrite="false" failonerror="false" />
+                                    <copy file="${basedir}/.project" todir="${project.build.directory}"
overwrite="false" failonerror="false" />
                                 </tasks>
                             </configuration>
                             <goals>
@@ -93,8 +93,8 @@
                             <phase>compile</phase>
                             <configuration>
                                 <tasks>
-                                    <copy file="${project.build.directory}/.classpath"
todir="${basedir}" overwrite="true" failonerror="false"/>
-                                    <copy file="${project.build.directory}/.project" todir="${basedir}"
overwrite="true" failonerror="false"/>
+                                    <copy file="${project.build.directory}/.classpath"
todir="${basedir}" overwrite="true" failonerror="false" />
+                                    <copy file="${project.build.directory}/.project" todir="${basedir}"
overwrite="true" failonerror="false" />
                                 </tasks>
                             </configuration>
                             <goals>

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/pom.xml Wed Dec 29 07:04:19 2010
@@ -18,7 +18,7 @@
 
 <!-- @version $Rev$ $Date$ -->
 
-<project>
+<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>
 

Modified: geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/server/pom.xml?rev=1053549&r1=1053548&r2=1053549&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/server/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.2/testsuite/server/pom.xml Wed Dec 29 07:04:19
2010
@@ -18,7 +18,7 @@
 
 <!-- @version $Rev$ $Date$ -->
 
-<project>
+<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>
                                                 
@@ -56,15 +56,14 @@
                                          | Unzip and rename the testsuite Geronimo server
v2.2.1
                                          |
                                          -->
-                                        <property name="geronimo_install1"       value="${basedir}/../launcher/"/>
-                                        <property name="geronimo_assembly1"      value="org/apache/geronimo/assemblies"/>
-                                        <property name="geronimo_name1"          value="geronimo-tomcat6-javaee5"/>
-                                        <property name="geronimoVersion_1"       value="2.2.1"/>
-                                        <mkdir dir="${geronimo_install1}"/>
-                                        <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimoVersion_1}/${geronimo_name1}-${geronimoVersion_1}-bin.zip"
-                                              dest="${geronimo_install1}"/>
+                                        <property name="geronimo_install1" value="${basedir}/../launcher/"
/>
+                                        <property name="geronimo_assembly1" value="org/apache/geronimo/assemblies"
/>
+                                        <property name="geronimo_name1" value="geronimo-tomcat6-javaee5"
/>
+                                        <property name="geronimoVersion_1" value="2.2.1"
/>
+                                        <mkdir dir="${geronimo_install1}" />
+                                        <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimoVersion_1}/${geronimo_name1}-${geronimoVersion_1}-bin.zip"
dest="${geronimo_install1}" />
                                         <move todir="${geronimo_install1}server_v2.2">
-                                            <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimoVersion_1}"/>
+                                            <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimoVersion_1}"
/>
                                         </move>
                                          
                                         <!--
@@ -72,15 +71,14 @@
                                          | Unzip and rename the testsuite Geronimo server
v2.1.7
                                          |
                                          -->
-                                        <property name="geronimo_install2"       value="${basedir}/../launcher/"/>
-                                        <property name="geronimo_assembly2"      value="org/apache/geronimo/assemblies"/>
-                                        <property name="geronimo_name2"          value="geronimo-tomcat6-javaee5"/>
-                                        <property name="geronimoVersion_2"       value="2.1.7"/>
-                                        <mkdir dir="${geronimo_install2}"/>
-                                        <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimoVersion_2}/${geronimo_name2}-${geronimoVersion_2}-bin.zip"
-                                              dest="${geronimo_install2}"/>
+                                        <property name="geronimo_install2" value="${basedir}/../launcher/"
/>
+                                        <property name="geronimo_assembly2" value="org/apache/geronimo/assemblies"
/>
+                                        <property name="geronimo_name2" value="geronimo-tomcat6-javaee5"
/>
+                                        <property name="geronimoVersion_2" value="2.1.7"
/>
+                                        <mkdir dir="${geronimo_install2}" />
+                                        <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimoVersion_2}/${geronimo_name2}-${geronimoVersion_2}-bin.zip"
dest="${geronimo_install2}" />
                                         <move todir="${geronimo_install2}server_v2.1">
-                                            <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimoVersion_2}"/>
+                                            <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimoVersion_2}"
/>
                                         </move>
                                          
                                         <!--
@@ -88,15 +86,14 @@
                                          | Unzip and rename the testsuite Geronimo server
v2.0.2
                                          |
                                          -->
-                                        <property name="geronimo_install3"       value="${basedir}/../launcher/"/>
-                                        <property name="geronimo_assembly3"      value="org/apache/geronimo/assemblies"/>
-                                        <property name="geronimo_name3"          value="geronimo-tomcat6-jee5"/>
-                                        <property name="geronimoVersion_3"       value="2.0.2"/>
-                                        <mkdir dir="${geronimo_install3}"/>
-                                        <unzip src="${settings.localRepository}/${geronimo_assembly3}/${geronimo_name3}/${geronimoVersion_3}/${geronimo_name3}-${geronimoVersion_3}-bin.zip"
-                                              dest="${geronimo_install3}"/>
+                                        <property name="geronimo_install3" value="${basedir}/../launcher/"
/>
+                                        <property name="geronimo_assembly3" value="org/apache/geronimo/assemblies"
/>
+                                        <property name="geronimo_name3" value="geronimo-tomcat6-jee5"
/>
+                                        <property name="geronimoVersion_3" value="2.0.2"
/>
+                                        <mkdir dir="${geronimo_install3}" />
+                                        <unzip src="${settings.localRepository}/${geronimo_assembly3}/${geronimo_name3}/${geronimoVersion_3}/${geronimo_name3}-${geronimoVersion_3}-bin.zip"
dest="${geronimo_install3}" />
                                         <move todir="${geronimo_install3}server_v2.0">
-                                            <fileset dir="${geronimo_install3}/${geronimo_name3}-${geronimoVersion_3}"/>
+                                            <fileset dir="${geronimo_install3}/${geronimo_name3}-${geronimoVersion_3}"
/>
                                         </move>
                                     </tasks>
                                 </configuration>



Mime
View raw message