You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2011/11/17 03:12:28 UTC
svn commit: r1203012 [26/28] - in /geronimo/devtools/eclipse-plugin/trunk:
eclipse/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/
plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/src/test/resources/application/
plugins/org.apache.geronimo.j2ee.v11.jaxb...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java Thu Nov 17 02:12:14 2011
@@ -35,7 +35,7 @@ import org.eclipse.ui.forms.widgets.Form
import org.eclipse.ui.forms.widgets.Section;
/**
- * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ * @version $Rev$ $Date$
*/
public class BlueprintGeneralSection extends AbstractBlueprintSectionPart {
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/BlueprintGeneralSection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/IBlueprintJAXBManipulator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/OtherElementsSection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/OtherElementsSection.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/OtherElementsSection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java Thu Nov 17 02:12:14 2011
@@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.ui.forms.widgets.FormToolkit;
/**
- * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ * @version $Rev$ $Date$
*/
public class TypeConverterSection extends AbstractBlueprintTreeSectionPart{
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/blueprint/TypeConverterSection.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/blueprint/BlueprintElementWizardProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/blueprint/BlueprintElementWizardProxy.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/wizards/blueprint/BlueprintElementWizardProxy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml Thu Nov 17 02:12:14 2011
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!--
- ~ 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: 677978 $ $Date: 2008-07-18 10:34:28 -0700 (Fri, 18 Jul 2008) $ -->
-
-<plugin
- id="org.apache.geronimo.testsuite.common"
- name="Geronimo v21 Server Tools Testsuite Plug-in"
- provider-name="Apache.org"
- version="3.0.0">
-
- <requires>
- <import plugin="abbot.swt"/>
- <import plugin="abbot.swt.eclipse"/>
- <import plugin="org.eclipse.ui.ide" optional="true"/>
- <import plugin="org.eclipse.jface.text" optional="true"/>
- <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
- <import plugin="org.eclipse.ui.editors" optional="true"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.ant.core"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.ui.externaltools"/>
- <import plugin="org.eclipse.ant.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.ui.console"/>
- </requires>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ ~ 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$ $Date$ -->
+
+<plugin
+ id="org.apache.geronimo.testsuite.common"
+ name="Geronimo v21 Server Tools Testsuite Plug-in"
+ provider-name="Apache.org"
+ version="3.0.0">
+
+ <requires>
+ <import plugin="abbot.swt"/>
+ <import plugin="abbot.swt.eclipse"/>
+ <import plugin="org.eclipse.ui.ide" optional="true"/>
+ <import plugin="org.eclipse.jface.text" optional="true"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
+ <import plugin="org.eclipse.ui.editors" optional="true"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.jdt.launching"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ant.core"/>
+ <import plugin="org.eclipse.debug.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.ui.externaltools"/>
+ <import plugin="org.eclipse.ant.ui"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.ui.console"/>
+ </requires>
+
+</plugin>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml Thu Nov 17 02:12:14 2011
@@ -1,218 +1,218 @@
-<?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.common</artifactId>
- <version>3.0.0</version>
- <packaging>jar</packaging>
- <name>${artifactId}</name>
-
- <parent>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>testsuite-plugins</artifactId>
- <version>3.0.0</version>
- </parent>
-
- <build>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <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>
-
- <!--
- |
- | 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>
- <id>unzip-selenium</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <unzip src="${settings.localRepository}/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"
- dest="${project.build.directory}/classes"/>
- <unzip src="${settings.localRepository}/org/seleniumhq/selenium/server/selenium-server/1.0.3/selenium-server-1.0.3-standalone.jar"
- dest="${project.build.directory}/classes"/>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>unzip-common</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.common-3.0.0"/>
- <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.common-3.0.0.jar"
- dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.common-3.0.0"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </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.v21.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.v21</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.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server-coreless</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- <version>1.0.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server-coreless</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.seleniumhq.selenium.core</groupId>
- <artifactId>selenium-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
-</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$ $Date$ -->
+
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.testsuite.common</artifactId>
+ <version>3.0.0</version>
+ <packaging>jar</packaging>
+ <name>${artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>testsuite-plugins</artifactId>
+ <version>3.0.0</version>
+ </parent>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <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>
+
+ <!--
+ |
+ | 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>
+ <id>unzip-selenium</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <unzip src="${settings.localRepository}/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"
+ dest="${project.build.directory}/classes"/>
+ <unzip src="${settings.localRepository}/org/seleniumhq/selenium/server/selenium-server/1.0.3/selenium-server-1.0.3-standalone.jar"
+ dest="${project.build.directory}/classes"/>
+ </tasks>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unzip-common</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.common-3.0.0"/>
+ <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.common-3.0.0.jar"
+ dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.common-3.0.0"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </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.v21.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.v21</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.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server-coreless</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ <version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server-coreless</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.core</groupId>
+ <artifactId>selenium-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java Thu Nov 17 02:12:14 2011
@@ -1,32 +1,32 @@
-/*
- * 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 org.apache.geronimo.testsuite.common;
-
-/**
- * AssertUtil
- *
- * @version $Rev$ $Date$
- */
-public class AssertUtil {
-
- public static void assertTrue( boolean value ) throws Exception {
- if ( !value ) {
- throw new Exception( "Error" );
- }
- }
-}
+/*
+ * 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 org.apache.geronimo.testsuite.common;
+
+/**
+ * AssertUtil
+ *
+ * @version $Rev$ $Date$
+ */
+public class AssertUtil {
+
+ public static void assertTrue( boolean value ) throws Exception {
+ if ( !value ) {
+ throw new Exception( "Error" );
+ }
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/AssertUtil.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java Thu Nov 17 02:12:14 2011
@@ -1,77 +1,77 @@
-/*
- * 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 org.apache.geronimo.testsuite.common.selenium;
-
-
-import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.swt.widgets.Shell;
-import org.openqa.selenium.server.SeleniumServer;
-import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
-import org.openqa.selenium.server.browserlaunchers.MockBrowserLauncher;
-
-/**
- * EclipseSeleniumServer
- *
- * @version $Rev$ $Date$
- */
-public class EclipseSeleniumServer implements ISafeRunnable{
-
- public static EclipseSeleniumServer INSTANCE;
- private SeleniumServer server;
- private AbbotHelper aHelper;
- private Shell shell;
-
- public EclipseSeleniumServer( AbbotHelper aHelper, Shell shell ) {
- this.aHelper = aHelper;
- this.shell = shell;
- INSTANCE = this;
- }
-
- public void stop() {
- server.stop();
- }
-
- public AbbotHelper getAHelper() {
- return aHelper;
- }
-
- public Shell getShell() {
- return shell;
- }
-
- public void handleException(Throwable arg0) {
-
- }
-
- public void run() throws Exception {
- try {
- BrowserLauncherFactory.addBrowserLauncher("MockBrowser", MockBrowserLauncher.class);
- //BrowserLauncherFactory.addBrowserLauncher("Firefox Browser", Firefox3Launcher.class);
- //SeleniumServer.setDebugMode (true);
- server = new SeleniumServer();
- server.start();
- } catch (Throwable th) {
- th.printStackTrace();
- Exception e = new Exception("unable to start Selenium server");
- e.initCause(th);
- throw (e);
- }
- }
-
-}
+/*
+ * 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 org.apache.geronimo.testsuite.common.selenium;
+
+
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.eclipse.core.runtime.ISafeRunnable;
+import org.eclipse.swt.widgets.Shell;
+import org.openqa.selenium.server.SeleniumServer;
+import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
+import org.openqa.selenium.server.browserlaunchers.MockBrowserLauncher;
+
+/**
+ * EclipseSeleniumServer
+ *
+ * @version $Rev$ $Date$
+ */
+public class EclipseSeleniumServer implements ISafeRunnable{
+
+ public static EclipseSeleniumServer INSTANCE;
+ private SeleniumServer server;
+ private AbbotHelper aHelper;
+ private Shell shell;
+
+ public EclipseSeleniumServer( AbbotHelper aHelper, Shell shell ) {
+ this.aHelper = aHelper;
+ this.shell = shell;
+ INSTANCE = this;
+ }
+
+ public void stop() {
+ server.stop();
+ }
+
+ public AbbotHelper getAHelper() {
+ return aHelper;
+ }
+
+ public Shell getShell() {
+ return shell;
+ }
+
+ public void handleException(Throwable arg0) {
+
+ }
+
+ public void run() throws Exception {
+ try {
+ BrowserLauncherFactory.addBrowserLauncher("MockBrowser", MockBrowserLauncher.class);
+ //BrowserLauncherFactory.addBrowserLauncher("Firefox Browser", Firefox3Launcher.class);
+ //SeleniumServer.setDebugMode (true);
+ server = new SeleniumServer();
+ server.start();
+ } catch (Throwable th) {
+ th.printStackTrace();
+ Exception e = new Exception("unable to start Selenium server");
+ e.initCause(th);
+ throw (e);
+ }
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java Thu Nov 17 02:12:14 2011
@@ -52,7 +52,7 @@ import abbot.swt.tester.TreeTester;
import abbot.swt.utilities.ExtendedComparator;
/**
- * @version $Rev: 679174 $ $Date: 2008-07-23 12:52:55 -0700 (Wed, 23 Jul 2008) $
+ * @version $Rev$ $Date$
*/
public class AbbotHelper {
private Shell workbenchShell;
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java Thu Nov 17 02:12:14 2011
@@ -1,66 +1,66 @@
-/*
- * 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 org.apache.geronimo.testsuite.common.ui;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-public final class Constants {
- public final static String SERVER_V30 = "v30";
- public final static String SERVER_V22 = "v22";
- public final static String SERVER_V21 = "v21";
- public final static String SERVER_V20 = "v20";
-
- public final static String SERVERNAME = "key_1";
- public final static String SERVERDISPLAY = "key_2";
- public final static String SERVERRUNTIME = "key_3";
- public final static String SERVERPATH = "key_4";
-
-
- private final static Map constants;
- static {
- constants = new Hashtable();
- addConstant( SERVER_V30, SERVERNAME, "Apache Geronimo v3.0 Server" );
- addConstant( SERVER_V22, SERVERNAME, "Apache Geronimo v2.2 Server" );
- addConstant( SERVER_V21, SERVERNAME, "Apache Geronimo v2.1 Server" );
- addConstant( SERVER_V20, SERVERNAME, "Apache Geronimo v2.0 Server" );
-
- addConstant( SERVER_V30, SERVERDISPLAY, "Apache Geronimo v3.0 Server at localhost" );
- addConstant( SERVER_V22, SERVERDISPLAY, "Apache Geronimo v2.2 Server at localhost" );
- addConstant( SERVER_V21, SERVERDISPLAY, "Apache Geronimo v2.1 Server at localhost" );
- addConstant( SERVER_V20, SERVERDISPLAY, "Apache Geronimo v2.0 Server at localhost" );
-
- addConstant( SERVER_V30, SERVERRUNTIME, "Apache Geronimo v3.0" );
- addConstant( SERVER_V22, SERVERRUNTIME, "Apache Geronimo v2.2" );
- addConstant( SERVER_V21, SERVERRUNTIME, "Apache Geronimo v2.1" );
- addConstant( SERVER_V20, SERVERRUNTIME, "Apache Geronimo v2.0" );
-
- addConstant( SERVER_V30, SERVERPATH, "server_v3.0" );
- addConstant( SERVER_V22, SERVERPATH, "server_v2.2" );
- addConstant( SERVER_V21, SERVERPATH, "server_v2.1" );
- addConstant( SERVER_V20, SERVERPATH, "server_v2.0" );
- }
-
- public static String getConstant( String version, String key ) {
- return (String)constants.get(version + key);
- }
-
- private static void addConstant( String version, String key, String value ) {
- constants.put(version + key, value);
- }
-}
+/*
+ * 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 org.apache.geronimo.testsuite.common.ui;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+public final class Constants {
+ public final static String SERVER_V30 = "v30";
+ public final static String SERVER_V22 = "v22";
+ public final static String SERVER_V21 = "v21";
+ public final static String SERVER_V20 = "v20";
+
+ public final static String SERVERNAME = "key_1";
+ public final static String SERVERDISPLAY = "key_2";
+ public final static String SERVERRUNTIME = "key_3";
+ public final static String SERVERPATH = "key_4";
+
+
+ private final static Map constants;
+ static {
+ constants = new Hashtable();
+ addConstant( SERVER_V30, SERVERNAME, "Apache Geronimo v3.0 Server" );
+ addConstant( SERVER_V22, SERVERNAME, "Apache Geronimo v2.2 Server" );
+ addConstant( SERVER_V21, SERVERNAME, "Apache Geronimo v2.1 Server" );
+ addConstant( SERVER_V20, SERVERNAME, "Apache Geronimo v2.0 Server" );
+
+ addConstant( SERVER_V30, SERVERDISPLAY, "Apache Geronimo v3.0 Server at localhost" );
+ addConstant( SERVER_V22, SERVERDISPLAY, "Apache Geronimo v2.2 Server at localhost" );
+ addConstant( SERVER_V21, SERVERDISPLAY, "Apache Geronimo v2.1 Server at localhost" );
+ addConstant( SERVER_V20, SERVERDISPLAY, "Apache Geronimo v2.0 Server at localhost" );
+
+ addConstant( SERVER_V30, SERVERRUNTIME, "Apache Geronimo v3.0" );
+ addConstant( SERVER_V22, SERVERRUNTIME, "Apache Geronimo v2.2" );
+ addConstant( SERVER_V21, SERVERRUNTIME, "Apache Geronimo v2.1" );
+ addConstant( SERVER_V20, SERVERRUNTIME, "Apache Geronimo v2.0" );
+
+ addConstant( SERVER_V30, SERVERPATH, "server_v3.0" );
+ addConstant( SERVER_V22, SERVERPATH, "server_v2.2" );
+ addConstant( SERVER_V21, SERVERPATH, "server_v2.1" );
+ addConstant( SERVER_V20, SERVERPATH, "server_v2.0" );
+ }
+
+ public static String getConstant( String version, String key ) {
+ return (String)constants.get(version + key);
+ }
+
+ private static void addConstant( String version, String key, String value ) {
+ constants.put(version + key, value);
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java?rev=1203012&r1=1203011&r2=1203012&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java Thu Nov 17 02:12:14 2011
@@ -1,196 +1,196 @@
-/*
- * 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 org.apache.geronimo.testsuite.common.ui;
-
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsuite.common.AssertUtil;
-import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.widgets.Shell;
-
-import abbot.swt.finder.generic.MultipleFoundException;
-import abbot.swt.finder.generic.NotFoundException;
-
-public class ProjectTasks {
- Shell workbenchShell;
- AbbotHelper abbotHelper;
-
- public ProjectTasks (Shell shell, AbbotHelper helper) {
- workbenchShell = shell;
- abbotHelper = helper;
- }
-
- public boolean deleteProject (String projectName) {
- boolean success = true;
- try {
- Shell questionShell = abbotHelper.rightClickItem (workbenchShell, projectName,
- new String[] {"&Delete"}, "Delete Resources");
-
- // use .* to signify use of a wildcard
- abbotHelper.clickButton (questionShell, "&Delete project contents.*");
- abbotHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
- abbotHelper.waitForDialogDisposal (questionShell);
- } catch (Exception e) {
- e.printStackTrace();
- success = false;
- }
- return success;
- }
-
- //TODO all methods from here down are specific to Tutorial5MinuteTest v20 and v21 and should not be here
- // would be nice to have some createXXXProjects that just do the basics
- public void createProjects() throws Exception {
- createEARProject ();
- createEJBProject ();
- createWARProject ();
- copyCode ();
- }
-
- private void createEARProject() throws MultipleFoundException, NotFoundException {
- Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
- "New");
-
- abbotHelper.clickTreeItem (wizardShell,
- new String[] {"Java EE", "Enterprise Application Project"});
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "", "SampleEAR");
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.clickButton (wizardShell, "Generate Deployment Descriptor");
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "default", "sampleear");
- abbotHelper.setTextField(wizardShell, "", "sample-ear");
- abbotHelper.setTextField(wizardShell, "car", "ear");
- abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
-
- abbotHelper.waitForDialogDisposal (wizardShell);
- }
-
- private void createEJBProject() throws MultipleFoundException, NotFoundException {
- Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
- "New");
-
- abbotHelper.clickTreeItem (wizardShell,
- new String[] {"EJB", "EJB Project"});
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "", "SampleEJB");
- abbotHelper.clickButton (wizardShell, "Add &project to an EAR");
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.clickButton (wizardShell, "Create an EJB Client JAR module to hold the client interfaces and classes.");
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "default", "sampleear");
- abbotHelper.setTextField(wizardShell, "", "sample-ejb");
- abbotHelper.setTextField(wizardShell, "car", "ejb");
- abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
-
- abbotHelper.waitForDialogDisposal (wizardShell);
-
- abbotHelper.doubleClickItem(workbenchShell, "SampleEJB");
- abbotHelper.doubleClickItem(workbenchShell, "ejbModule");
- abbotHelper.doubleClickItem(workbenchShell, "META-INF");
- Shell questionShell = abbotHelper.rightClickItem(workbenchShell, "openejb-jar.xml",
- new String[] {"&Delete"}, "Delete Resources");
- abbotHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
- abbotHelper.waitForDialogDisposal (questionShell);
- }
-
- private void createWARProject() throws MultipleFoundException, NotFoundException {
- Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
- "New");
-
- abbotHelper.clickTreeItem (wizardShell,
- new String[] {"Web", "Dynamic Web Project"});
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "", "SampleWAR");
- abbotHelper.clickButton (wizardShell, "Add &project to an EAR");
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.setTextField(wizardShell, "default", "sampleear");
- abbotHelper.setTextField(wizardShell, "", "sample-war");
- abbotHelper.setTextField(wizardShell, "car", "war");
- abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
-
- abbotHelper.waitForDialogDisposal (wizardShell);
- }
-
- private void copyCode () throws Exception {
- abbotHelper.clickItem (workbenchShell, "SampleWAR");
- Shell propShell = abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&Project", "&Properties"},
- "Properties for SampleWAR");
- abbotHelper.clickItem (propShell, "Java EE Module Dependencies");
- abbotHelper.clickButton (propShell, "Select &All");
- abbotHelper.clickButton (propShell, "&Apply");
- abbotHelper.clickButton (propShell, IDialogConstants.OK_LABEL);
-
- IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject aProject = aWSRoot.getProject ("SampleEJB");
- IFolder aFolder = aProject.getFolder("ejbModule/sampleear");
- aFolder.create (false, true, null);
- String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/ui-tutorial";
- IFile aFile = aProject.getFile("ejbModule/sampleear/RemoteBusinessInterface.java");
- aFile.create(new FileInputStream (fileDir + "/RemoteBusinessInterface.java"), true, null);
- aFile = aProject.getFile("ejbModule/sampleear/MyStatelessSessionBean.java");
- aFile.create(new FileInputStream (fileDir + "/MyStatelessSessionBean.java"), true, null);
-
- aProject = aWSRoot.getProject ("SampleWAR");
- aFolder = aProject.getFolder("src/sampleear");
- aFolder.create (false, true, null);
- aFile = aProject.getFile("WebContent/index.jsp");
- aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
- // have to go through Servlet Creation dialog to make the web.xml correct
- Shell servletShell = abbotHelper.rightClickItem(workbenchShell, "SampleWAR",
- new String [] {"&New", "Servlet"}, "Create Servlet");
- abbotHelper.setCursorText("MyServlet");
- abbotHelper.setTextField(servletShell, "", "sampleear");
- abbotHelper.clickButton (servletShell, IDialogConstants.NEXT_LABEL);
- abbotHelper.clickItem(servletShell, "/MyServlet");
- Shell urlShell = abbotHelper.clickEnabledButton (servletShell, "Edit...", "URL Mappings");
- abbotHelper.setTextField(urlShell, "/MyServlet", "/sayHello");
- abbotHelper.clickButton (urlShell, IDialogConstants.OK_LABEL);
- abbotHelper.clickButton (servletShell, IDialogConstants.FINISH_LABEL);
-
- // copy over the correct contents
- aFile = aProject.getFile("src/sampleear/MyServlet.java");
- aFile.setContents(new FileInputStream (fileDir + "/MyServlet.java"), true, true, null);
-
- // close the open file
- abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&File", "&Close"});
- }
-
- public void webTesting () throws Exception {
- EclipseSelenium selenium = new EclipseSelenium();
- selenium.start();
- selenium.open( "http://localhost:8080/SampleWAR/");
- selenium.type("name", "Tom");
- selenium.click("submit");
- selenium.waitForPageToLoad( "3000" );
- AssertUtil.assertTrue(selenium.getHtmlSource().indexOf( "says hello to" ) > 0);
-
- selenium.stop();
- }
-}
+/*
+ * 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 org.apache.geronimo.testsuite.common.ui;
+
+import java.io.FileInputStream;
+
+import org.apache.geronimo.testsuite.common.AssertUtil;
+import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.widgets.Shell;
+
+import abbot.swt.finder.generic.MultipleFoundException;
+import abbot.swt.finder.generic.NotFoundException;
+
+public class ProjectTasks {
+ Shell workbenchShell;
+ AbbotHelper abbotHelper;
+
+ public ProjectTasks (Shell shell, AbbotHelper helper) {
+ workbenchShell = shell;
+ abbotHelper = helper;
+ }
+
+ public boolean deleteProject (String projectName) {
+ boolean success = true;
+ try {
+ Shell questionShell = abbotHelper.rightClickItem (workbenchShell, projectName,
+ new String[] {"&Delete"}, "Delete Resources");
+
+ // use .* to signify use of a wildcard
+ abbotHelper.clickButton (questionShell, "&Delete project contents.*");
+ abbotHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
+ abbotHelper.waitForDialogDisposal (questionShell);
+ } catch (Exception e) {
+ e.printStackTrace();
+ success = false;
+ }
+ return success;
+ }
+
+ //TODO all methods from here down are specific to Tutorial5MinuteTest v20 and v21 and should not be here
+ // would be nice to have some createXXXProjects that just do the basics
+ public void createProjects() throws Exception {
+ createEARProject ();
+ createEJBProject ();
+ createWARProject ();
+ copyCode ();
+ }
+
+ private void createEARProject() throws MultipleFoundException, NotFoundException {
+ Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+ new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+ "New");
+
+ abbotHelper.clickTreeItem (wizardShell,
+ new String[] {"Java EE", "Enterprise Application Project"});
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "", "SampleEAR");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.clickButton (wizardShell, "Generate Deployment Descriptor");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "default", "sampleear");
+ abbotHelper.setTextField(wizardShell, "", "sample-ear");
+ abbotHelper.setTextField(wizardShell, "car", "ear");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+
+ abbotHelper.waitForDialogDisposal (wizardShell);
+ }
+
+ private void createEJBProject() throws MultipleFoundException, NotFoundException {
+ Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+ new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+ "New");
+
+ abbotHelper.clickTreeItem (wizardShell,
+ new String[] {"EJB", "EJB Project"});
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "", "SampleEJB");
+ abbotHelper.clickButton (wizardShell, "Add &project to an EAR");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.clickButton (wizardShell, "Create an EJB Client JAR module to hold the client interfaces and classes.");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "default", "sampleear");
+ abbotHelper.setTextField(wizardShell, "", "sample-ejb");
+ abbotHelper.setTextField(wizardShell, "car", "ejb");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+
+ abbotHelper.waitForDialogDisposal (wizardShell);
+
+ abbotHelper.doubleClickItem(workbenchShell, "SampleEJB");
+ abbotHelper.doubleClickItem(workbenchShell, "ejbModule");
+ abbotHelper.doubleClickItem(workbenchShell, "META-INF");
+ Shell questionShell = abbotHelper.rightClickItem(workbenchShell, "openejb-jar.xml",
+ new String[] {"&Delete"}, "Delete Resources");
+ abbotHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
+ abbotHelper.waitForDialogDisposal (questionShell);
+ }
+
+ private void createWARProject() throws MultipleFoundException, NotFoundException {
+ Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+ new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+ "New");
+
+ abbotHelper.clickTreeItem (wizardShell,
+ new String[] {"Web", "Dynamic Web Project"});
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "", "SampleWAR");
+ abbotHelper.clickButton (wizardShell, "Add &project to an EAR");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.setTextField(wizardShell, "default", "sampleear");
+ abbotHelper.setTextField(wizardShell, "", "sample-war");
+ abbotHelper.setTextField(wizardShell, "car", "war");
+ abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+
+ abbotHelper.waitForDialogDisposal (wizardShell);
+ }
+
+ private void copyCode () throws Exception {
+ abbotHelper.clickItem (workbenchShell, "SampleWAR");
+ Shell propShell = abbotHelper.clickMenuItem (workbenchShell,
+ new String[] {"&Project", "&Properties"},
+ "Properties for SampleWAR");
+ abbotHelper.clickItem (propShell, "Java EE Module Dependencies");
+ abbotHelper.clickButton (propShell, "Select &All");
+ abbotHelper.clickButton (propShell, "&Apply");
+ abbotHelper.clickButton (propShell, IDialogConstants.OK_LABEL);
+
+ IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
+ IProject aProject = aWSRoot.getProject ("SampleEJB");
+ IFolder aFolder = aProject.getFolder("ejbModule/sampleear");
+ aFolder.create (false, true, null);
+ String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/ui-tutorial";
+ IFile aFile = aProject.getFile("ejbModule/sampleear/RemoteBusinessInterface.java");
+ aFile.create(new FileInputStream (fileDir + "/RemoteBusinessInterface.java"), true, null);
+ aFile = aProject.getFile("ejbModule/sampleear/MyStatelessSessionBean.java");
+ aFile.create(new FileInputStream (fileDir + "/MyStatelessSessionBean.java"), true, null);
+
+ aProject = aWSRoot.getProject ("SampleWAR");
+ aFolder = aProject.getFolder("src/sampleear");
+ aFolder.create (false, true, null);
+ aFile = aProject.getFile("WebContent/index.jsp");
+ aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
+ // have to go through Servlet Creation dialog to make the web.xml correct
+ Shell servletShell = abbotHelper.rightClickItem(workbenchShell, "SampleWAR",
+ new String [] {"&New", "Servlet"}, "Create Servlet");
+ abbotHelper.setCursorText("MyServlet");
+ abbotHelper.setTextField(servletShell, "", "sampleear");
+ abbotHelper.clickButton (servletShell, IDialogConstants.NEXT_LABEL);
+ abbotHelper.clickItem(servletShell, "/MyServlet");
+ Shell urlShell = abbotHelper.clickEnabledButton (servletShell, "Edit...", "URL Mappings");
+ abbotHelper.setTextField(urlShell, "/MyServlet", "/sayHello");
+ abbotHelper.clickButton (urlShell, IDialogConstants.OK_LABEL);
+ abbotHelper.clickButton (servletShell, IDialogConstants.FINISH_LABEL);
+
+ // copy over the correct contents
+ aFile = aProject.getFile("src/sampleear/MyServlet.java");
+ aFile.setContents(new FileInputStream (fileDir + "/MyServlet.java"), true, true, null);
+
+ // close the open file
+ abbotHelper.clickMenuItem (workbenchShell,
+ new String[] {"&File", "&Close"});
+ }
+
+ public void webTesting () throws Exception {
+ EclipseSelenium selenium = new EclipseSelenium();
+ selenium.start();
+ selenium.open( "http://localhost:8080/SampleWAR/");
+ selenium.type("name", "Tom");
+ selenium.click("submit");
+ selenium.waitForPageToLoad( "3000" );
+ AssertUtil.assertTrue(selenium.getHtmlSource().indexOf( "says hello to" ) > 0);
+
+ selenium.stop();
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
------------------------------------------------------------------------------
svn:mime-type = text/plain