Skip to content

Commit

Permalink
Added new websphere 9 server
Browse files Browse the repository at this point in the history
  • Loading branch information
koval-jan committed Mar 6, 2019
1 parent ef8e6c0 commit 68b7444
Show file tree
Hide file tree
Showing 19 changed files with 325 additions and 261 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# oomph-task-server
[Eclipse Oomph](https://projects.eclipse.org/projects/tools.oomph) extension tasks for creating Weblogic 12.1.3, WebSphere (7.0, 8.0, 8.5) and Tomcat (7.0, 8.0, 8.5) servers during setup.
[Eclipse Oomph](https://projects.eclipse.org/projects/tools.oomph) extension tasks for creating Weblogic 12.1.3, WebSphere (7.0, 8.0, 8.5, 9) and Tomcat (7.0, 8.0, 8.5) servers during setup.

## Installation
Update site: https://gratex.github.io/oomph-task-server/repository/
Expand Down Expand Up @@ -69,7 +69,7 @@ Sample Oracle Weblogic remote server definition
* password - username password

### WebSphere
Sample IBM WebSphere (7.0, 8.0, 8.5) server definition
Sample IBM WebSphere (7.0, 8.0, 8.5, 9) server definition

```xml
<setupTask
Expand All @@ -85,7 +85,7 @@ Sample IBM WebSphere (7.0, 8.0, 8.5) server definition
remoteOsPassword="waslxc."/>
```

* serverVersion - websphere version to create ("WebSphere 7.0", "WebSphere 8.0", or "WebSphere 8.5")
* serverVersion - websphere version to create ("WebSphere 7.0", "WebSphere 8.0", "WebSphere 8.5" or "WebSphere 9")
* runtimeName - eclipse runtime name for websphere server
* serverName - websphere server instance name
* location - websphere server installation location
Expand Down
2 changes: 1 addition & 1 deletion com.gratex.oomph.task.server.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.gratex.eclipse</groupId>
<artifactId>com.gratex.oomph.task.server.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../com.gratex.oomph.task.server.parent</relativePath>
</parent>


<artifactId>com.gratex.oomph.task.server.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
223 changes: 115 additions & 108 deletions com.gratex.oomph.task.server.parent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,109 +1,116 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.gratex.eclipse</groupId>
<artifactId>com.gratex.oomph.task.server.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
<name>Gratex International, a. s.</name>
<url>http://www.gratex.com</url>
</organization>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tycho-version>1.0.0</tycho-version>
<neon-repo.url>http://download.eclipse.org/releases/neon/</neon-repo.url>
<neon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.6/</neon-updates-repo.url>
<oepe-neon-repo.url>http://download.oracle.com/otn_software/oepe/neon/</oepe-neon-repo.url>
<oepe-neon-12.2.1.3.1-repo.url>http://download.oracle.com/otn_software/oepe/12.2.1.3.1/neon/repository/</oepe-neon-12.2.1.3.1-repo.url>
<oepe-neon-12.2.1.3.1-deps-repo.url>http://download.oracle.com/otn_software/oepe/12.2.1.3.1/neon/repository/dependencies</oepe-neon-12.2.1.3.1-deps-repo.url>
<sapphire-repo.url>http://download.eclipse.org/sapphire/9.0.5/repository/</sapphire-repo.url>
<ibm-wasdev-neon-repo.url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/wdt/neon/</ibm-wasdev-neon-repo.url>
</properties>

<modules>
<module>../com.gratex.oomph.task.server</module>
<module>../com.gratex.oomph.task.server.feature</module>
<module>../com.gratex.oomph.task.server.edit</module>
<module>../com.gratex.oomph.task.server.site</module>
</modules>

<repositories>
<repository>
<id>neon</id>
<url>${neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>neon-updates</id>
<url>${neon-updates-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon</id>
<url>${oepe-neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon-12.2.1.3.1</id>
<url>${oepe-neon-12.2.1.3.1-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon-12.2.1.3.1-deps</id>
<url>${oepe-neon-12.2.1.3.1-deps-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>sapphire</id>
<url>${sapphire-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>ibm-wasdev-neon</id>
<url>${ibm-wasdev-neon-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-publisher-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<!-- enable the Tycho build extension -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

</plugins>
</build>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.gratex.eclipse</groupId>
<artifactId>com.gratex.oomph.task.server.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
<name>Gratex International, a. s.</name>
<url>http://www.gratex.com</url>
</organization>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<tycho-version>1.2.0</tycho-version>
<neon-repo.url>http://download.eclipse.org/releases/neon/</neon-repo.url>
<neon-updates-repo.url>http://download.eclipse.org/eclipse/updates/4.6/</neon-updates-repo.url>
<oepe-neon-repo.url>http://download.oracle.com/otn_software/oepe/neon/</oepe-neon-repo.url>
<oepe-neon-12.2.1.3.1-repo.url>http://download.oracle.com/otn_software/oepe/12.2.1.3.1/neon/repository/</oepe-neon-12.2.1.3.1-repo.url>
<oepe-neon-12.2.1.3.1-deps-repo.url>http://download.oracle.com/otn_software/oepe/12.2.1.3.1/neon/repository/dependencies</oepe-neon-12.2.1.3.1-deps-repo.url>
<sapphire-repo.url>http://download.eclipse.org/sapphire/9.0.5/repository/</sapphire-repo.url>
<ibm-wasdev-neon-repo.url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/wdt/neon/</ibm-wasdev-neon-repo.url>
<ibm-wasdev-photon-repo.url>http://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/updates/wdt/photon/</ibm-wasdev-photon-repo.url>
</properties>

<modules>
<module>../com.gratex.oomph.task.server</module>
<module>../com.gratex.oomph.task.server.feature</module>
<module>../com.gratex.oomph.task.server.edit</module>
<module>../com.gratex.oomph.task.server.site</module>
</modules>

<repositories>
<repository>
<id>neon</id>
<url>${neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>neon-updates</id>
<url>${neon-updates-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon</id>
<url>${oepe-neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon-12.2.1.3.1</id>
<url>${oepe-neon-12.2.1.3.1-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>oepe-neon-12.2.1.3.1-deps</id>
<url>${oepe-neon-12.2.1.3.1-deps-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>sapphire</id>
<url>${sapphire-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>ibm-wasdev-neon</id>
<url>${ibm-wasdev-neon-repo.url}</url>
<layout>p2</layout>
</repository>
<repository>
<id>ibm-wasdev-photon</id>
<url>${ibm-wasdev-photon-repo.url}</url>
<layout>p2</layout>
</repository>
</repositories>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-p2-extras-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-publisher-plugin</artifactId>
<version>${tycho-version}</version>
</plugin>
<plugin>
<!-- enable the Tycho build extension -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>

</plugins>
</build>
</project>
55 changes: 28 additions & 27 deletions com.gratex.oomph.task.server.site/pom.xml
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>com.gratex.oomph.task.server.site</artifactId>
<packaging>eclipse-repository</packaging>

<parent>
<groupId>com.gratex.eclipse</groupId>
<artifactId>com.gratex.oomph.task.server.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../com.gratex.oomph.task.server.parent</relativePath>
</parent>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<repositoryName>Oomph Setup Tasks</repositoryName>
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
</plugins>
</build>
</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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.gratex.eclipse</groupId>
<artifactId>com.gratex.oomph.task.server.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../com.gratex.oomph.task.server.parent</relativePath>
</parent>

<artifactId>com.gratex.oomph.task.server.site</artifactId>
<packaging>eclipse-repository</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
<repositoryName>Oomph Setup Tasks</repositoryName>
<includeAllDependencies>false</includeAllDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
5 changes: 4 additions & 1 deletion com.gratex.oomph.task.server/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: com.gratex.oomph.task.server;singleton:=true
Automatic-Module-Name: com.gratex.oomph.task.server
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Expand All @@ -20,7 +21,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
com.ibm.websphere.v85.core;bundle-version="1.0.200";resolution:=optional,
com.ibm.ws.ast.st.v85.core;bundle-version="1.0.400";resolution:=optional,
com.ibm.websphere.v8.core;bundle-version="1.0.400";resolution:=optional,
com.ibm.ws.ast.st.v8.core;bundle-version="1.0.600";resolution:=optional
com.ibm.ws.ast.st.v8.core;bundle-version="1.0.600";resolution:=optional,
com.ibm.websphere.v9.core;bundle-version="1.100.1";resolution:=optional,
com.ibm.ws.ast.st.v9.core;bundle-version="1.0.52";resolution:=optional
Export-Package: com.gratex.oomph.task.server;version="1.0.0",
com.gratex.oomph.task.server.impl;version="1.0.0",
com.gratex.oomph.task.server.util;version="1.0.0"
Expand Down
1 change: 1 addition & 0 deletions com.gratex.oomph.task.server/model/Server-1.0.ecore
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
<eLiterals name="WAS70" literal="WebSphere 7.0"/>
<eLiterals name="WAS80" value="1" literal="WebSphere 8.0"/>
<eLiterals name="WAS85" value="2" literal="WebSphere 8.5"/>
<eLiterals name="WAS9" value="3" literal="WebSphere 9"/>
</eClassifiers>
</ecore:EPackage>
1 change: 1 addition & 0 deletions com.gratex.oomph.task.server/model/Server.ecore
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@
<eLiterals name="WAS70" literal="WebSphere 7.0"/>
<eLiterals name="WAS80" value="1" literal="WebSphere 8.0"/>
<eLiterals name="WAS85" value="2" literal="WebSphere 8.5"/>
<eLiterals name="WAS9" value="3" literal="WebSphere 9"/>
</eClassifiers>
</ecore:EPackage>
18 changes: 12 additions & 6 deletions com.gratex.oomph.task.server/model/Server.genmodel
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//TomcatServerVersion/TOMCAT80"/>
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//TomcatServerVersion/TOMCAT85"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="Server.ecore#//WebsphereServerVersion">
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//WebsphereServerVersion/WAS70"/>
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//WebsphereServerVersion/WAS80"/>
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//WebsphereServerVersion/WAS85"/>
<genEnumLiterals ecoreEnumLiteral="Server.ecore#//WebsphereServerVersion/WAS9"/>
</genEnums>
<genClasses ecoreClass="Server.ecore#//TomcatServerTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//TomcatServerTask/jreVersion"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//TomcatServerTask/port"/>
Expand All @@ -37,24 +43,24 @@
<genClasses ecoreClass="Server.ecore#//WebsphereServerTask">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/baseServerName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/profilePath"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/profileName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/bootstrapPort"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/icpPort"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/soapPort"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/remoteOsUser"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/remoteOsPassword"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/serverVersion"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/securityUserId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//WebsphereServerTask/securityUserPassword"/>
</genClasses>
<genClasses image="false" ecoreClass="Server.ecore#//Server">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/serverName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/location"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/runtimeName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/hostname"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Server.ecore#//Server/serverContainer"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/cleanPreviousRuntimes"/>
</genClasses>
<genClasses ecoreClass="Server.ecore#//ServerTaskContainer">
<genFeatures property="None" children="true" createChild="true" propertyCategory=""
propertyDescription="" ecoreFeature="ecore:EReference Server.ecore#//ServerTaskContainer/servers"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//ServerTaskContainer/cleanPreviousRuntimes"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/startTimeout"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Server.ecore#//Server/stopTimeout"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
Loading

0 comments on commit 68b7444

Please sign in to comment.