Skip to content

Commit 483bd2c

Browse files
ddsharpeddsharpe
authored
Merge branch 'master' into wdt_issue_246
2 parents 6d181ba + 7e4527b commit 483bd2c

File tree

279 files changed

+2806
-739
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+2806
-739
lines changed

‎KnownIssues.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
The following list are known issues. The issue may contain a work-around or an associated Issue number.
22

3+
**ISSUE**:
4+
The createDomain and updateDomain tools cannot target non-JRF product resources to dynamic clusters because
5+
WebLogic WLST will not assign resources associated with extension or custom template user server groups
6+
to dynamic clusters. Resources associated to JRF user server groups defined in the domain typedef
7+
(i.e. JRF, RestrictedJRF) will be targeted to the dynamic cluster by the WDT tools using the FMW WLST function
8+
applyJRF.
9+
10+
If you have only non-JRF user server groups targeted to a dynamic cluster, you will see the following message:
11+
12+
WLSDPLY-12238: Unable to target non-JRF template server groups for domain type <your domain typedef> to dynamic cluster(s).
13+
14+
You will not see this message if you have a mix of non-JRF and JRF user server groups targeted to the dynamic
15+
cluster. WDT cannot detect if a user server group is associated to JRF, and therefore, whether the applyJRF will
16+
target the user group resources to the dynamic cluster.
17+
18+
**ACTION**:
19+
20+
You must contact WebLogic support to assist you with a solution for this targeting dilemma. You can perform
21+
the following action as a temporary work-around to the described issue.
22+
23+
1. Add a configured managed server to your dynamic cluster and re-run the createDomain or updateDomain tool.
24+
The dynamic cluster becomes a "mixed" cluster once the managed server is added. When the WDT tool targets the
25+
user server groups to the configured managed server, the resources are automatically targeted to the cluster
26+
by WebLogic, which includes both the managed server and the dynamic servers.
27+
328
**ISSUE**:
429
The discoverDomain STDOUT contains many SEVERE messages about cd() and ls() when it is run against a 12.2.1 domain.
530
The discover tool navigates through the domain MBeans using wlst to determine which MBeans are present in a

‎LICENSE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
23

34
The Universal Permissive License (UPL), Version 1.0
45

‎README.md

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ Many organizations are using WebLogic Server, with or without other Oracle Fusio
1616
- [Model Names](#model-names)
1717
- [Model Semantics](#model-semantics)
1818
- [Administration Server Configuration](site/admin_server.md)
19-
- [Modeling Security Providers](site/security_providers.md)
20-
- [JRF Trust Service Identity Asserter](site/security_providers.md#trust-service-identity-asserter)
21-
- [Custom Security Providers](site/security_providers.md#custom-security-providers)
19+
- [Model Security](site/security.md)
20+
- [Modeling Security Providers](site/security_providers.md)
21+
- [JRF Trust Service Identity Asserter](site/security_providers.md#trust-service-identity-asserter)
22+
- [Custom Security Providers](site/security_providers.md#custom-security-providers)
23+
- [Modeling WebLogic Users, Groups, and Roles](site/security_users_groups_roles.md)
2224
- [Variable Injection](site/variable_injection.md)
2325
- [Model Filters](site/tool_filters.md)
2426
- [Downloading and Installing](#downloading-and-installing-the-software)
@@ -220,11 +222,44 @@ One of the primary goals of the WebLogic Deploy Tooling is to support a sparse m
220222

221223
### Using Multiple Models
222224

223-
The Create Domain, Update Domain, Deploy Applications, and Validate Model tools allow the specification of multiple models on the command line. For example:
225+
The Create Domain, Update Domain, Deploy Applications, and Validate Model Tools allow the specification of multiple models on the command line. For example:
224226

225227
weblogic-deploy\bin\createDomain.cmd -model_file modelOne,modelTwo,modelThree ...
226228

227-
In this case, the models are merged into a single model before being applied. Each successive model is layered onto the previous ones, so any existing values from the previous models are overwritten. The resulting model is then verified before being applied.
229+
In this case, the models are merged into a single model before being applied. Each successive model is added to the previous model. In cases where entities exist in both models, the attributes are combined and attribute values from successive models prevail. The resulting model is then verified before being applied.
230+
For example, if Model 1 looks like:
231+
```yaml
232+
topology:
233+
Server:
234+
m1:
235+
ListenPort: 7000
236+
Notes: "Server 1"
237+
m2:
238+
ListenPort: 9000
239+
```
240+
and Model 2 looks like:
241+
```yaml
242+
topology:
243+
Server:
244+
m1:
245+
ListenAddress: myhostname
246+
ListenPort: 8000
247+
m3:
248+
ListenPort: 10000
249+
```
250+
The attributes for server m1 are merged, server m2 is left unchanged, and server m3 is added. The resulting model would be:
251+
```yaml
252+
topology:
253+
Server:
254+
m1:
255+
ListenAddress: myhostname
256+
ListenPort: 8000
257+
Notes: "Server 1"
258+
m2:
259+
ListenPort: 9000
260+
m3:
261+
ListenPort: 10000
262+
```
228263

229264
## Downloading and Installing the Software
230265

‎THIRD_PARTY_LICENSES.txt

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
Apache Fluent-hc:
2+
Copyright 2002-2019 The Apache Software Foundation
3+
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).
6+
7+
Apache Commons FileUpload:
8+
Copyright 2002-2019 The Apache Software Foundation
9+
10+
This product includes software developed at
11+
The Apache Software Foundation (http://www.apache.org/).
12+
13+
Apache HttpComponents Client:
14+
Copyright 2002-2019 The Apache Software Foundation
15+
16+
This product includes software developed at
17+
The Apache Software Foundation (http://www.apache.org/).
18+
19+
Apache HttpComponents Core:
20+
Copyright 2005-2018 The Apache Software Foundation
21+
22+
This product includes software developed at
23+
The Apache Software Foundation (http://www.apache.org/).
24+
25+
Apache Commons IO:
26+
Copyright 2002-2019 The Apache Software Foundation
27+
28+
This product includes software developed at
29+
The Apache Software Foundation (http://www.apache.org/).
30+
31+
Apache License
32+
                           Version 2.0, January 2004
33+
                        http://www.apache.org/licenses/
34+
35+
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
36+
37+
   1. Definitions.
38+
39+
      "License" shall mean the terms and conditions for use, reproduction,
40+
      and distribution as defined by Sections 1 through 9 of this document.
41+
42+
      "Licensor" shall mean the copyright owner or entity authorized by
43+
      the copyright owner that is granting the License.
44+
45+
      "Legal Entity" shall mean the union of the acting entity and all
46+
      other entities that control, are controlled by, or are under common
47+
      control with that entity. For the purposes of this definition,
48+
      "control" means (i) the power, direct or indirect, to cause the
49+
      direction or management of such entity, whether by contract or
50+
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
51+
      outstanding shares, or (iii) beneficial ownership of such entity.
52+
53+
      "You" (or "Your") shall mean an individual or Legal Entity
54+
      exercising permissions granted by this License.
55+
56+
      "Source" form shall mean the preferred form for making modifications,
57+
      including but not limited to software source code, documentation
58+
      source, and configuration files.
59+
60+
      "Object" form shall mean any form resulting from mechanical
61+
      transformation or translation of a Source form, including but
62+
      not limited to compiled object code, generated documentation,
63+
      and conversions to other media types.
64+
65+
      "Work" shall mean the work of authorship, whether in Source or
66+
      Object form, made available under the License, as indicated by a
67+
      copyright notice that is included in or attached to the work
68+
      (an example is provided in the Appendix below).
69+
70+
      "Derivative Works" shall mean any work, whether in Source or Object
71+
      form, that is based on (or derived from) the Work and for which the
72+
      editorial revisions, annotations, elaborations, or other modifications
73+
      represent, as a whole, an original work of authorship. For the purposes
74+
      of this License, Derivative Works shall not include works that remain
75+
      separable from, or merely link (or bind by name) to the interfaces of,
76+
      the Work and Derivative Works thereof.
77+
78+
      "Contribution" shall mean any work of authorship, including
79+
      the original version of the Work and any modifications or additions
80+
      to that Work or Derivative Works thereof, that is intentionally
81+
      submitted to Licensor for inclusion in the Work by the copyright owner
82+
      or by an individual or Legal Entity authorized to submit on behalf of
83+
      the copyright owner. For the purposes of this definition, "submitted"
84+
      means any form of electronic, verbal, or written communication sent
85+
      to the Licensor or its representatives, including but not limited to
86+
      communication on electronic mailing lists, source code control systems,
87+
      and issue tracking systems that are managed by, or on behalf of, the
88+
      Licensor for the purpose of discussing and improving the Work, but
89+
      excluding communication that is conspicuously marked or otherwise
90+
      designated in writing by the copyright owner as "Not a Contribution."
91+
92+
      "Contributor" shall mean Licensor and any individual or Legal Entity
93+
      on behalf of whom a Contribution has been received by Licensor and
94+
      subsequently incorporated within the Work.
95+
96+
   2. Grant of Copyright License. Subject to the terms and conditions of
97+
      this License, each Contributor hereby grants to You a perpetual,
98+
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
99+
      copyright license to reproduce, prepare Derivative Works of,
100+
      publicly display, publicly perform, sublicense, and distribute the
101+
      Work and such Derivative Works in Source or Object form.
102+
103+
   3. Grant of Patent License. Subject to the terms and conditions of
104+
      this License, each Contributor hereby grants to You a perpetual,
105+
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
106+
      (except as stated in this section) patent license to make, have made,
107+
      use, offer to sell, sell, import, and otherwise transfer the Work,
108+
      where such license applies only to those patent claims licensable
109+
      by such Contributor that are necessarily infringed by their
110+
      Contribution(s) alone or by combination of their Contribution(s)
111+
      with the Work to which such Contribution(s) was submitted. If You
112+
      institute patent litigation against any entity (including a
113+
      cross-claim or counterclaim in a lawsuit) alleging that the Work
114+
      or a Contribution incorporated within the Work constitutes direct
115+
      or contributory patent infringement, then any patent licenses
116+
      granted to You under this License for that Work shall terminate
117+
      as of the date such litigation is filed.
118+
119+
   4. Redistribution. You may reproduce and distribute copies of the
120+
      Work or Derivative Works thereof in any medium, with or without
121+
      modifications, and in Source or Object form, provided that You
122+
      meet the following conditions:
123+
124+
      (a) You must give any other recipients of the Work or
125+
          Derivative Works a copy of this License; and
126+
127+
      (b) You must cause any modified files to carry prominent notices
128+
          stating that You changed the files; and
129+
130+
      (c) You must retain, in the Source form of any Derivative Works
131+
          that You distribute, all copyright, patent, trademark, and
132+
          attribution notices from the Source form of the Work,
133+
          excluding those notices that do not pertain to any part of
134+
          the Derivative Works; and
135+
136+
      (d) If the Work includes a "NOTICE" text file as part of its
137+
          distribution, then any Derivative Works that You distribute must
138+
          include a readable copy of the attribution notices contained
139+
          within such NOTICE file, excluding those notices that do not
140+
          pertain to any part of the Derivative Works, in at least one
141+
          of the following places: within a NOTICE text file distributed
142+
          as part of the Derivative Works; within the Source form or
143+
          documentation, if provided along with the Derivative Works; or,
144+
          within a display generated by the Derivative Works, if and
145+
          wherever such third-party notices normally appear. The contents
146+
          of the NOTICE file are for informational purposes only and
147+
          do not modify the License. You may add Your own attribution
148+
          notices within Derivative Works that You distribute, alongside
149+
          or as an addendum to the NOTICE text from the Work, provided
150+
          that such additional attribution notices cannot be construed
151+
          as modifying the License.
152+
153+
      You may add Your own copyright statement to Your modifications and
154+
      may provide additional or different license terms and conditions
155+
      for use, reproduction, or distribution of Your modifications, or
156+
      for any such Derivative Works as a whole, provided Your use,
157+
      reproduction, and distribution of the Work otherwise complies with
158+
      the conditions stated in this License.
159+
160+
   5. Submission of Contributions. Unless You explicitly state otherwise,
161+
      any Contribution intentionally submitted for inclusion in the Work
162+
      by You to the Licensor shall be under the terms and conditions of
163+
      this License, without any additional terms or conditions.
164+
      Notwithstanding the above, nothing herein shall supersede or modify
165+
      the terms of any separate license agreement you may have executed
166+
      with Licensor regarding such Contributions.
167+
168+
   6. Trademarks. This License does not grant permission to use the trade
169+
      names, trademarks, service marks, or product names of the Licensor,
170+
      except as required for reasonable and customary use in describing the
171+
      origin of the Work and reproducing the content of the NOTICE file.
172+
173+
   7. Disclaimer of Warranty. Unless required by applicable law or
174+
      agreed to in writing, Licensor provides the Work (and each
175+
      Contributor provides its Contributions) on an "AS IS" BASIS,
176+
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
177+
      implied, including, without limitation, any warranties or conditions
178+
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
179+
      PARTICULAR PURPOSE. You are solely responsible for determining the
180+
      appropriateness of using or redistributing the Work and assume any
181+
      risks associated with Your exercise of permissions under this License.
182+
183+
   8. Limitation of Liability. In no event and under no legal theory,
184+
      whether in tort (including negligence), contract, or otherwise,
185+
      unless required by applicable law (such as deliberate and grossly
186+
      negligent acts) or agreed to in writing, shall any Contributor be
187+
      liable to You for damages, including any direct, indirect, special,
188+
      incidental, or consequential damages of any character arising as a
189+
      result of this License or out of the use or inability to use the
190+
      Work (including but not limited to damages for loss of goodwill,
191+
      work stoppage, computer failure or malfunction, or any and all
192+
      other commercial damages or losses), even if such Contributor
193+
      has been advised of the possibility of such damages.
194+
195+
   9. Accepting Warranty or Additional Liability. While redistributing
196+
      the Work or Derivative Works thereof, You may choose to offer,
197+
      and charge a fee for, acceptance of support, warranty, indemnity,
198+
      or other liability obligations and/or rights consistent with this
199+
      License. However, in accepting such obligations, You may act only
200+
      on Your own behalf and on Your sole responsibility, not on behalf
201+
      of any other Contributor, and only if You agree to indemnify,
202+
      defend, and hold each Contributor harmless for any liability
203+
      incurred by, or claims asserted against, such Contributor by reason
204+
      of your accepting any such warranty or additional liability.
205+
206+
   END OF TERMS AND CONDITIONS

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
44
The Universal Permissive License (UPL), Version 1.0
55
-->
66
<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">

‎core/src/main/antlr4/oracle/weblogic/deploy/json/JSON.g4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
33
* The Universal Permissive License (UPL), Version 1.0
44
*
55
* Credits:
@@ -63,4 +63,4 @@ fragment EXP
6363
// \- since - means "range" inside [...]
6464
WS
6565
: [ \t\n\r] + -> skip
66-
;
66+
;

‎core/src/main/antlr4/oracle/weblogic/deploy/yaml/Yaml.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
33
* The Universal Permissive License (UPL), Version 1.0
44
*/
55
grammar Yaml;

‎core/src/main/java/oracle/weblogic/deploy/aliases/AliasException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
3-
* The Universal Permissive License (UPL), Version 1.0
2+
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.aliases;
66

‎core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
3-
* The Universal Permissive License (UPL), Version 1.0
3+
* Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.aliases;
66

‎core/src/main/java/oracle/weblogic/deploy/aliases/VersionException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
3-
* The Universal Permissive License (UPL), Version 1.0
2+
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.aliases;
66

0 commit comments

Comments
 (0)