Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.

#
Expand All @@ -20,15 +20,6 @@ function createFolder {
fi
}

#
# Check a file exists
# $1 - path of file to check
function checkFileExists {
if [ ! -f $1 ]; then
fail "The file $1 does not exist"
fi
}

function checkCreateDomainScript {
if [ -f $1 ]; then
echo The domain will be created using the script $1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,35 @@ topology:
'@@PROP:clusterName@@':
Server:
'@@PROP:adminServerName@@':
ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
Log:
FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:adminServerName@@.log'
NetworkAccessPoint:
T3Channel:
ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
ListenPort: '@@PROP:t3ChannelPort@@'
PublicAddress: '@@PROP:t3PublicAddress@@'
PublicPort: '@@PROP:t3ChannelPort@@'
'@@PROP:managedServerNameBase@@1':
Cluster: '@@PROP:clusterName@@'
ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@1'
ListenPort: '@@PROP:managedServerPort@@'
NumOfRetriesBeforeMsiMode: 0
RetryIntervalBeforeMsiMode: 1
JTAMigratableTarget:
Cluster: '@@PROP:clusterName@@'
UserPreferredServer: '@@PROP:managedServerNameBase@@1'
Log:
FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:managedServerNameBase@@1.log'
'@@PROP:managedServerNameBase@@2':
Cluster: '@@PROP:clusterName@@'
ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@2'
ListenPort: '@@PROP:managedServerPort@@'
NumOfRetriesBeforeMsiMode: 0
RetryIntervalBeforeMsiMode: 1
JTAMigratableTarget:
Cluster: '@@PROP:clusterName@@'
UserPreferredServer: '@@PROP:managedServerNameBase@@2'
Log:
FileName: '/shared/logs/@@PROP:managedServerNameBase@@2.log'
'@@PROP:managedServerNameBase@@3':
Cluster: '@@PROP:clusterName@@'
ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@3'
ListenPort: '@@PROP:managedServerPort@@'
NumOfRetriesBeforeMsiMode: 0
RetryIntervalBeforeMsiMode: 1
JTAMigratableTarget:
Cluster: '@@PROP:clusterName@@'
UserPreferredServer: '@@PROP:managedServerNameBase@@3'
Log:
FileName: '/shared/logs/@@PROP:domainUID@@/@@PROP:managedServerNameBase@@3.log'
MigratableTarget:
'@@PROP:managedServerNameBase@@1 (migratable)':
Cluster: '@@PROP:clusterName@@'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@ topology:
ServerTemplate: '@@PROP:clusterName@@-template'
Server:
'@@PROP:adminServerName@@':
ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
NetworkAccessPoint:
T3Channel:
ListenAddress: '@@PROP:domainUID@@-@@PROP:adminServerName@@'
ListenPort: '@@PROP:t3ChannelPort@@'
PublicAddress: '@@PROP:t3PublicAddress@@'
PublicPort: '@@PROP:t3ChannelPort@@'
ServerTemplate:
'@@PROP:clusterName@@-template':
Cluster: '@@PROP:clusterName@@'
ListenAddress: '@@PROP:domainUID@@-@@PROP:managedServerNameBase@@${id}'
ListenPort: '@@PROP:managedServerPort@@'
JTAMigratableTarget:
Cluster: '@@PROP:clusterName@@'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
# Copyright 2018, 2019, Oracle Corporation and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.

def getEnvVar(var):
Expand Down Expand Up @@ -48,15 +48,13 @@ def getEnvVar(var):
# Configure the Administration Server
# ===================================
cd('/Servers/AdminServer')
set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
set('ListenPort', admin_port)
set('Name', admin_server_name)

create('T3Channel', 'NetworkAccessPoint')
cd('/Servers/%s/NetworkAccessPoints/T3Channel' % admin_server_name)
set('PublicPort', t3_channel_port)
set('PublicAddress', t3_public_address)
set('ListenAddress', '%s-%s' % (domain_uid, admin_server_name_svc))
set('ListenPort', t3_channel_port)

# Set the admin user's username and password
Expand Down Expand Up @@ -87,7 +85,6 @@ def getEnvVar(var):
create(name, 'Server')
cd('/Servers/%s/' % name )
print('managed server name is %s' % name);
set('ListenAddress', '%s-%s' % (domain_uid, name_svc))
set('ListenPort', server_port)
set('NumOfRetriesBeforeMSIMode', 0)
set('RetryIntervalBeforeMSIMode', 1)
Expand All @@ -102,7 +99,6 @@ def getEnvVar(var):
print('Done creating Server Template: %s' % templateName)
cd('/ServerTemplates/%s' % templateName)
cmo.setListenPort(server_port)
cmo.setListenAddress('%s-%s${id}' % (domain_uid, managed_server_name_base_svc))
cmo.setCluster(cl)
print('Done setting attributes for Server Template: %s' % templateName);

Expand Down